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

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
1=== modified file 'breezy/plugins/weave_fmt/test_bzrdir.py'
2--- breezy/plugins/weave_fmt/test_bzrdir.py 2017-06-11 01:22:16 +0000
3+++ breezy/plugins/weave_fmt/test_bzrdir.py 2017-06-20 22:11:06 +0000
4@@ -39,7 +39,7 @@
5 from ...osutils import (
6 getcwd,
7 )
8-from ...tests.test_bundle import V4BundleTester
9+from ...tests import test_bundle
10 from ...tests.test_sftp_transport import TestCaseWithSFTPServer
11 from ...tests import (
12 TestCaseWithTransport,
13@@ -580,7 +580,7 @@
14 self.assertEqual('', err)
15
16
17-class V4WeaveBundleTester(V4BundleTester):
18+class V4WeaveBundleTester(test_bundle.V4BundleTester):
19
20 def bzrdir_format(self):
21 return 'metaweave'

Subscribers

People subscribed via source and target branches