Breezy

Merge lp:~jelmer/brz/bundle-dupe-tests into lp:brz

  1. bundle-dupe-tests
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/bundle-dupe-tests
Merge into: lp:brz
Diff against target: 21 lines (+2/-2)
1 file modified
breezy/plugins/weave_fmt/test_bzrdir.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/bundle-dupe-tests
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+326037@code.launchpad.net

Commit message

Avoid importing V4BundleTest twice.

Description of the change

Avoid importing V4BundleTest twice.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Funny.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/plugins/weave_fmt/test_bzrdir.py'
--- breezy/plugins/weave_fmt/test_bzrdir.py 2017-06-11 01:22:16 +0000
+++ breezy/plugins/weave_fmt/test_bzrdir.py 2017-06-20 22:11:06 +0000
@@ -39,7 +39,7 @@
39from ...osutils import (39from ...osutils import (
40 getcwd,40 getcwd,
41 )41 )
42from ...tests.test_bundle import V4BundleTester42from ...tests import test_bundle
43from ...tests.test_sftp_transport import TestCaseWithSFTPServer43from ...tests.test_sftp_transport import TestCaseWithSFTPServer
44from ...tests import (44from ...tests import (
45 TestCaseWithTransport,45 TestCaseWithTransport,
@@ -580,7 +580,7 @@
580 self.assertEqual('', err)580 self.assertEqual('', err)
581581
582582
583class V4WeaveBundleTester(V4BundleTester):583class V4WeaveBundleTester(test_bundle.V4BundleTester):
584584
585 def bzrdir_format(self):585 def bzrdir_format(self):
586 return 'metaweave'586 return 'metaweave'

Subscribers

People subscribed via source and target branches