launchpad-reviewers team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/new-testtools into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #785086 in Launchpad itself: "bundled testtools breaks with newer versions of subunit"
  https://bugs.launchpad.net/launchpad/+bug/785086

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/new-testtools/+merge/61535

Switch to using a newer bundled version of testtools which is compatible with
more recent versions of subunit.

Without this, I can't use ./bin/test because I get the following exception:

Traceback (most recent call last):
  File "./bin/test", line 175, in <module>
      from lp.testing import pgsql
    File "/home/jelmer/lp/lib/lp/scripts/utilities/importfascist.py", line 189, in import_fascist
      module = original_import(name, globals, locals, fromlist, level)
    File "/home/jelmer/lp/lib/lp/testing/__init__.py", line 90, in <module>
      import subunit
    File "/home/jelmer/lp/lib/lp/scripts/utilities/importfascist.py", line 189, in import_fascist
      module = original_import(name, globals, locals, fromlist, level)
    File "/usr/lib/python2.6/dist-packages/subunit/__init__.py", line 126, in <module>
      from testtools.compat import _b, _u, BytesIO, StringIO
  ImportError: cannot import name BytesIO
-- 
https://code.launchpad.net/~jelmer/launchpad/new-testtools/+merge/61535
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/new-testtools into lp:launchpad.

=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2010-09-03 03:12:39 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2011-05-19 10:51:16 +0000
@@ -582,17 +582,17 @@
                     pass
             else:
                 raise NotBranchError(self.source_details.url)
-            foreign_branch = format.open(transport).open_branch()
-            foreign_branch_tip = foreign_branch.last_revision()
-            inter_branch = InterBranch.get(foreign_branch, bazaar_branch)
-            self._logger.info("Importing foreign branch.")
+            remote_branch = format.open(transport).open_branch()
+            remote_branch_tip = remote_branch.last_revision()
+            inter_branch = InterBranch.get(remote_branch, bazaar_branch)
+            self._logger.info("Importing branch.")
             pull_result = inter_branch.pull(
                 overwrite=True, **self.getExtraPullArgs())
-            self._logger.info("Pushing foreign branch to central store.")
+            self._logger.info("Pushing local import branch to central store.")
             self.pushBazaarBranch(bazaar_branch)
             last_imported_revison = bazaar_branch.last_revision()
             self._logger.info("Job complete.")
-            if last_imported_revison == foreign_branch_tip:
+            if last_imported_revison == remote_branch_tip:
                 if pull_result.old_revid != pull_result.new_revid:
                     return CodeImportWorkerExitCode.SUCCESS
                 else:

=== modified file 'versions.cfg'
--- versions.cfg	2011-05-17 00:07:05 +0000
+++ versions.cfg	2011-05-19 10:51:16 +0000
@@ -73,7 +73,7 @@
 soupmatchers = 0.1r53
 sourcecodegen = 0.6.9
 storm = 0.18.0.99-lpwithnodatetime-r393
-testtools = 0.9.10
+testtools = 0.9.11-r189
 transaction = 1.0.0
 Twisted = 11.0.0
 uuid = 1.30