* Python2.6 support was broken by the fixup feature.

  (Arfrever Frehtes Taifersar Arahesis, #987490)

diff --git a/NEWS b/NEWS
index 2fd1ce75cb36672633cc8fe6b0ff6ae3053384c2..8c2211fab063b792d44c8f74247a515ea9f9e589 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,9 @@ BUG FIXES
   '--no-xfail', '--no-passthrough, '--no-success', and gives you just the
   failure stream. (John Arbash Meinel)
 
+* Python2.6 support was broken by the fixup feature.
+  (Arfrever Frehtes Taifersar Arahesis, #987490)
+
 * Python3 support regressed in trunk.
   (Arfrever Frehtes Taifersar Arahesis, #987514)
 

diff --git a/python/subunit/tests/test_subunit_filter.py b/python/subunit/tests/test_subunit_filter.py
index 3d63ff56326159e2a41f07a5f450ca0268db243f..33b924824d32453f2385fdff7888c62e836dfe0a 100644 (file)
--- a/python/subunit/tests/test_subunit_filter.py
+++ b/python/subunit/tests/test_subunit_filter.py
@@ -231,7 +231,7 @@ xfail todo
         self.run_tests(result_filter, subunit_stream)
         foo = subunit.RemotedTestCase('foo')
         self.maxDiff = None
-        self.assertSequenceEqual(
+        self.assertEqual(
             [('time', date_a),
              ('time', date_b),
              ('startTest', foo),
@@ -259,7 +259,7 @@ xfail todo
         result_filter.stopTestRun()
         foo = subunit.RemotedTestCase('foo')
         self.maxDiff = None
-        self.assertSequenceEqual(
+        self.assertEqual(
             [('startTestRun',),
              ('time', date_a),
              ('time', date_c),
@@ -279,6 +279,10 @@ xfail todo
              ('addSkip', foo, {}),
              ('stopTest', foo), ], result._events)
 
+    if sys.version_info < (2, 7):
+        # These tests require Python >=2.7.
+        del test_fixup_expected_failures, test_fixup_expected_errors, test_fixup_unexpected_success
+
 
 class TestFilterCommand(TestCase):