From 7ac8bfe737faaeb1ee6e65cc2e14dd0657109b90 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 25 Oct 2015 10:44:04 -0400
Subject: [PATCH] Test: Merged tw-1475.t into configuration.t

---
 test/configuration.t | 22 +++++++++++++++-
 test/tw-1475.t       | 62 --------------------------------------------
 2 files changed, 21 insertions(+), 63 deletions(-)
 delete mode 100755 test/tw-1475.t

diff --git a/test/configuration.t b/test/configuration.t
index cd15ee39b..886df7329 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -36,7 +36,6 @@ from basetest import Task, TestCase
 
 
 class TestConfiguration(TestCase):
-
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
@@ -73,6 +72,27 @@ class TestConfiguration(TestCase):
         code, out, err = self.t.runError("config foo")
         self.assertIn("No entry named 'foo' found.", err)
 
+
+class TestBug1475(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_config_unmolested(self):
+        """1475: Verify that a config value is not borked by lex/eval"""
+        self.t.config("name", "one/two/three")
+
+        code, out, err = self.t("_get rc.name")
+        self.assertEqual("one/two/three\n", out)
+
+    def test_config_unmolested_2(self):
+        """1475: Verify that a config value is not borked by lex/eval - literal"""
+        self.t("config name one/two/three", input="y\n")
+
+        code, out, err = self.t("_get rc.name")
+        self.assertEqual("one/two/three\n", out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/tw-1475.t b/test/tw-1475.t
deleted file mode 100755
index aa96c1405..000000000
--- a/test/tw-1475.t
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python2.7
-# -*- coding: utf-8 -*-
-###############################################################################
-#
-# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# http://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-import sys
-import os
-import unittest
-# Ensure python finds the local simpletap module
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from basetest import Task, TestCase
-
-
-class TestBug1475(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_config_unmolested(self):
-        """Verify that a config value is not borked by lex/eval"""
-        self.t.config("name", "one/two/three")
-
-        code, out, err = self.t("_get rc.name")
-        self.assertEqual("one/two/three\n", out)
-
-    def test_config_unmolested_2(self):
-        """Verify that a config value is not borked by lex/eval - literal"""
-        self.t("config name one/two/three", input="y\n")
-
-        code, out, err = self.t("_get rc.name")
-        self.assertEqual("one/two/three\n", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python