Rev 4987: We're testing TestCase not TestRunner. in file:///home/vila/src/bzr/bugs/add-attr-cleanup/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/add-attr-cleanup/

------------------------------------------------------------
revno: 4987
revision-id: v.ladeuil+lp at free.fr-20100123174313-a8mhs9t1jxy3i7p7
parent: v.ladeuil+lp at free.fr-20100123172001-ujlk1bobwau2vcxx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: add-attr-cleanup
timestamp: Sat 2010-01-23 18:43:13 +0100
message:
  We're testing TestCase not TestRunner.
  
  * bzrlib/tests/test_selftest.py:
  (TestRunner.test_addAttrCleanup): Deleted
  (TestTestCase.test_addAttrCleanup): Added.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2010-01-23 10:27:37 +0000
+++ b/bzrlib/tests/test_selftest.py	2010-01-23 17:43:13 +0000
@@ -1252,26 +1252,6 @@
         result = self.run_test_runner(runner, test)
         self.assertLength(1, calls)
 
-    def test_addAttrCleanup(self):
-        self.test_attr = 'original' # Define a test attribute
-        obj = self # Make 'obj' visible to the embedded test
-        class Test(tests.TestCase):
-
-            def setUp(self):
-                tests.TestCase.setUp(self)
-                self.orig = self.addAttrCleanup(obj, 'test_attr')
-                obj.test_attr = 'modified'
-
-            def test_value(self):
-                self.assertEqual('original', self.orig)
-                self.assertEqual('modified', obj.test_attr)
-
-        runner = tests.TextTestRunner(stream=self._log_file)
-        test = Test('test_value')
-        result = self.run_test_runner(runner, test)
-        self.assertTrue(result.wasSuccessful())
-        self.assertEqual('original', obj.test_attr)
-
 
 class SampleTestCase(tests.TestCase):
 
@@ -1654,6 +1634,24 @@
         self.assertRaises(AssertionError,
             self.assertListRaises, _TestException, success_generator)
 
+    def test_addAttrCleanup(self):
+        self.test_attr = 'original' # Define a test attribute
+        obj = self # Make 'obj' visible to the embedded test
+        class Test(tests.TestCase):
+
+            def setUp(self):
+                tests.TestCase.setUp(self)
+                self.orig = self.addAttrCleanup(obj, 'test_attr')
+                obj.test_attr = 'modified'
+
+            def test_value(self):
+                self.assertEqual('original', self.orig)
+                self.assertEqual('modified', obj.test_attr)
+
+        test = Test('test_value')
+        test.run(unittest.TestResult())
+        self.assertEqual('original', obj.test_attr)
+
 
 # NB: Don't delete this; it's not actually from 0.11!
 @deprecated_function(deprecated_in((0, 11, 0)))