Merge updates from tag-collapsing-rigor.

2 files changed, 21 insertions, 0 deletions

diff --git a/python/subunit/test_results.py b/python/subunit/test_results.py
index 465b266..fea3b07 100644
--- a/python/subunit/test_results.py
+++ b/python/subunit/test_results.py
@@ -248,6 +248,8 @@ class TagCollapsingDecorator(HookedTestResultDecorator):
             self.decorated.tags(new_tags, gone_tags)
         if self._current_test_tags:
             self._current_test_tags = set(), set()
+        else:
+            self._global_tags = set(), set()
 
     def tags(self, new_tags, gone_tags):
         """Handle tag instructions.
diff --git a/python/subunit/tests/test_test_results.py b/python/subunit/tests/test_test_results.py
index 09b4c2f..3c4f686 100644
--- a/python/subunit/tests/test_test_results.py
+++ b/python/subunit/tests/test_test_results.py
@@ -212,6 +212,25 @@ class TestTagCollapsingDecorator(TestCase):
              ('startTest', self),
              ], result._events)
 
+    def test_tags_collapsed_outside_of_tests_are_flushed(self):
+        result = ExtendedTestResult()
+        tag_collapser = subunit.test_results.TagCollapsingDecorator(result)
+        tag_collapser.startTestRun()
+        tag_collapser.tags(set(['a']), set())
+        tag_collapser.tags(set(['b']), set())
+        tag_collapser.startTest(self)
+        tag_collapser.addSuccess(self)
+        tag_collapser.stopTest(self)
+        tag_collapser.stopTestRun()
+        self.assertEquals(
+            [('startTestRun',),
+             ('tags', set(['a', 'b']), set([])),
+             ('startTest', self),
+             ('addSuccess', self),
+             ('stopTest', self),
+             ('stopTestRun',),
+             ], result._events)
+
     def test_tags_forwarded_after_tests(self):
         test = subunit.RemotedTestCase('foo')
         result = ExtendedTestResult()