Merge lp:~gz/bzr-git/trivial_use_knownFailure_method into lp:bzr-git

[Martin Packman]

Per bzrlib.tests the KnownFailure exception class is deprecated, but the knownFailure method on TestCase works as a replacement. This also avoids incompatibilities with Python 2.7 unittest changes, see bug 607400 for more information.

=== modified file 'tests/test_blackbox.py'
--- tests/test_blackbox.py	2011-09-03 14:09:07 +0000
+++ tests/test_blackbox.py	2011-09-04 19:43:23 +0000
@@ -30,7 +30,6 @@
     )
 
 from bzrlib.tests.blackbox import ExternalBase
-from bzrlib.tests import KnownFailure
 
 from bzrlib.plugins.git import (
     tests,
@@ -100,7 +99,7 @@
         self.simple_commit()
 
         if bzrlib_version < (2, 4):
-            raise KnownFailure("bzr info uses inventory on bzr < 2.4")
+            self.knownFailure("bzr info uses inventory on bzr < 2.4")
 
         output, error = self.run_bzr(['info', '-v'])
         self.assertEqual(error, '')
@@ -110,7 +109,7 @@
         self.assertTrue("repository: Git Repository" in output)
 
     def test_push_roundtripping(self):
-        raise KnownFailure("roundtripping is not yet supported")
+        self.knownFailure("roundtripping is not yet supported")
         self.with_roundtripping()
         os.mkdir("bla")
         GitRepo.init(os.path.join(self.test_dir, "bla"))