From 10978cc9ae808202cf7c4b96adb1965056e4a0c6 Mon Sep 17 00:00:00 2001
From: Robert Collins <robertc@robertcollins.net>
Date: Mon, 4 May 2015 12:35:50 +1200
Subject: CHANGES -------

* Tests fixed for Python 3.3, 3.4, 3.5. (Robert Collins)
---
 NEWS                                      |  5 +++++
 lib/testscenarios/tests/test_scenarios.py | 27 ++++++++++++++-------------
 lib/testscenarios/tests/test_testcase.py  | 18 ++++++++----------
 setup.py                                  |  5 ++++-
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/NEWS b/NEWS
index fc3a10c..bb05854 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ testscenarios release notes
 IN DEVELOPMENT
 ~~~~~~~~~~~~~~
 
+CHANGES
+-------
+
+* Tests fixed for Python 3.3, 3.4, 3.5. (Robert Collins)
+
 0.4
 ~~~
 
diff --git a/lib/testscenarios/tests/test_scenarios.py b/lib/testscenarios/tests/test_scenarios.py
index 97aa17f..6378d99 100644
--- a/lib/testscenarios/tests/test_scenarios.py
+++ b/lib/testscenarios/tests/test_scenarios.py
@@ -17,6 +17,11 @@
 
 import unittest
 
+import testtools
+from testtools.matchers import EndsWith
+
+from testtools.tests.helpers import LoggingResult
+
 import testscenarios
 from testscenarios.scenarios import (
     apply_scenario,
@@ -25,8 +30,6 @@ from testscenarios.scenarios import (
     load_tests_apply_scenarios,
     multiply_scenarios,
     )
-import testtools
-from testtools.tests.helpers import LoggingResult
 
 
 class TestGenerateScenarios(testtools.TestCase):
@@ -58,9 +61,8 @@ class TestGenerateScenarios(testtools.TestCase):
         test = ReferenceTest("test_pass")
         log = self.hook_apply_scenarios()
         tests = list(generate_scenarios(test))
-        self.assertEqual(
-            'testscenarios.tests.test_scenarios.ReferenceTest.test_pass(demo)',
-            tests[0].id())
+        self.expectThat(
+            tests[0].id(), EndsWith('ReferenceTest.test_pass(demo)'))
         self.assertEqual([([('demo', {})], test)], log)
 
     def test_all_scenarios_yielded(self):
@@ -70,12 +72,10 @@ class TestGenerateScenarios(testtools.TestCase):
                 pass
         test = ReferenceTest("test_pass")
         tests = list(generate_scenarios(test))
-        self.assertEqual(
-            'testscenarios.tests.test_scenarios.ReferenceTest.test_pass(1)',
-            tests[0].id())
-        self.assertEqual(
-            'testscenarios.tests.test_scenarios.ReferenceTest.test_pass(2)',
-            tests[1].id())
+        self.expectThat(
+            tests[0].id(), EndsWith('ReferenceTest.test_pass(1)'))
+        self.expectThat(
+            tests[1].id(), EndsWith('ReferenceTest.test_pass(2)'))
 
     def test_scenarios_attribute_cleared(self):
         class ReferenceTest(unittest.TestCase):
@@ -132,11 +132,11 @@ class TestApplyScenario(testtools.TestCase):
 
     def test_sets_specified_id(self):
         raw_test = self.ReferenceTest('test_pass')
-        raw_id = "testscenarios.tests.test_scenarios.ReferenceTest.test_pass"
+        raw_id = "ReferenceTest.test_pass"
         scenario_name = self.scenario_name
         expect_id = "%(raw_id)s(%(scenario_name)s)" % vars()
         modified_test = apply_scenario(self.scenario, raw_test)
-        self.assertEqual(expect_id, modified_test.id())
+        self.expectThat(modified_test.id(), EndsWith(expect_id))
 
     def test_sets_specified_attributes(self):
         raw_test = self.ReferenceTest('test_pass')
@@ -152,6 +152,7 @@ class TestApplyScenario(testtools.TestCase):
         expect_desc = "%(raw_desc)s (%(scenario_name)s)" % vars()
         self.assertEqual(expect_desc, modified_test.shortDescription())
 
+
 class TestApplyScenarios(testtools.TestCase):
 
     def test_calls_apply_scenario(self):
diff --git a/lib/testscenarios/tests/test_testcase.py b/lib/testscenarios/tests/test_testcase.py
index 74d2fe1..4860758 100644
--- a/lib/testscenarios/tests/test_testcase.py
+++ b/lib/testscenarios/tests/test_testcase.py
@@ -16,10 +16,11 @@
 
 import unittest
 
-import testscenarios
 import testtools
+from testtools.matchers import EndsWith
 from testtools.tests.helpers import LoggingResult
 
+import testscenarios
 
 class TestTestWithScenarios(testtools.TestCase):
 
@@ -55,9 +56,8 @@ class TestTestWithScenarios(testtools.TestCase):
         test.run(result)
         self.assertTrue(result.wasSuccessful())
         self.assertEqual(1, result.testsRun)
-        self.assertEqual(
-            'testscenarios.tests.test_testcase.ReferenceTest.test_pass(demo)',
-            log[0][1].id())
+        self.expectThat(
+            log[0][1].id(), EndsWith('ReferenceTest.test_pass(demo)'))
 
     def test_with_two_scenarios_two_run(self):
         class ReferenceTest(self.Implementation):
@@ -70,12 +70,10 @@ class TestTestWithScenarios(testtools.TestCase):
         test.run(result)
         self.assertTrue(result.wasSuccessful())
         self.assertEqual(2, result.testsRun)
-        self.assertEqual(
-            'testscenarios.tests.test_testcase.ReferenceTest.test_pass(1)',
-            log[0][1].id())
-        self.assertEqual(
-            'testscenarios.tests.test_testcase.ReferenceTest.test_pass(2)',
-            log[4][1].id())
+        self.expectThat(
+            log[0][1].id(), EndsWith('ReferenceTest.test_pass(1)'))
+        self.expectThat(
+            log[4][1].id(), EndsWith('ReferenceTest.test_pass(2)'))
 
     def test_attributes_set(self):
         class ReferenceTest(self.Implementation):
diff --git a/setup.py b/setup.py
index 6b0d596..20ffc90 100755
--- a/setup.py
+++ b/setup.py
@@ -27,5 +27,8 @@ setup(name="testscenarios",
           ],
       install_requires = [
         'testtools',
-        ]
+        ],
+      tests_require = [
+        'testtools >= 1',
+        ],
       )
-- 
cgit v1.2.1