Rev 4402: (John Szakmeister) Fix error formatting for tar related KnowFailure in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Jun 3 16:02:15 BST 2009


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4402
revision-id: pqm at pqm.ubuntu.com-20090603150209-szap3popp2j8fpl3
parent: pqm at pqm.ubuntu.com-20090603080435-2gbqwzvbx31zr7ok
parent: john at szakmeister.net-20090603101623-9tbdbxk6wmv4pxbz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-06-03 16:02:09 +0100
message:
  (John Szakmeister) Fix error formatting for tar related KnowFailure
  	on Mac
modified:
  bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
    ------------------------------------------------------------
    revno: 4398.2.1
    revision-id: john at szakmeister.net-20090603101623-9tbdbxk6wmv4pxbz
    parent: pqm at pqm.ubuntu.com-20090602153906-1q6bresxw669b34i
    committer: jszakmeister <john at szakmeister.net>
    branch nick: export-test-fix
    timestamp: Wed 2009-06-03 06:16:23 -0400
    message:
      Wrap the argument to the KnownFailure string as a tuple to keep from getting an error about not consuming all the arguments.
    modified:
      bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- a/bzrlib/tests/blackbox/test_export.py	2009-04-06 14:18:33 +0000
+++ b/bzrlib/tests/blackbox/test_export.py	2009-06-03 10:16:23 +0000
@@ -60,7 +60,7 @@
 
         if sys.version_info < (2, 5, 2) and sys.platform == 'darwin':
             raise tests.KnownFailure('python %r has a tar related bug, upgrade'
-                                     % sys.version_info)
+                                     % (sys.version_info,))
         out, err = self.run_bzr('export --format=tgz --root=test -')
         ball = tarfile.open('', fileobj=StringIO(out))
         self.assertEqual(['test/a'], sorted(ball.getnames()))




More information about the bazaar-commits mailing list