Merge lp:~jayvdb/testscenarios/fix-py3-tests into lp:~testtools-committers/testscenarios/trunk

[John Vandenberg]

[Robert Collins (lifeless)]

Thanks for spotting this. assertTrue has the downside that its very hard to diagnose failures, so I fixed this using EndsWith instead. Also found other cases in 3.5 that broke too, so fixed them as well. Have pushed the fixes to trunk.

=== modified file 'lib/testscenarios/tests/test_testcase.py'
--- lib/testscenarios/tests/test_testcase.py	2012-04-04 10:45:22 +0000
+++ lib/testscenarios/tests/test_testcase.py	2015-04-26 05:03:14 +0000
@@ -55,9 +55,7 @@
         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.assertTrue(log[0][1].id().endswith('ReferenceTest.test_pass(demo)'))
 
     def test_with_two_scenarios_two_run(self):
         class ReferenceTest(self.Implementation):
@@ -70,12 +68,8 @@
         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.assertTrue(log[0][1].id().endswith('ReferenceTest.test_pass(1)'))
+        self.assertTrue(log[4][1].id().endswith('ReferenceTest.test_pass(2)'))
 
     def test_attributes_set(self):
         class ReferenceTest(self.Implementation):