Merge lp:~jelmer/bzr-tarmacland/fix-import into lp:bzr-tarmacland

Proposed by Jelmer Vernooij on 2011-01-10
Status: Merged
Approved by: Ursula Junque on 2011-01-11
Approved revision: 84
Merged at revision: 83
Proposed branch: lp:~jelmer/bzr-tarmacland/fix-import
Merge into: lp:bzr-tarmacland
Diff against target: 16 lines (+1/-5)
1 file modified
tests/test_tarmac_land.py (+1/-5)
To merge this branch: bzr merge lp:~jelmer/bzr-tarmacland/fix-import
Reviewer Review Type Date Requested Status
Ursula Junque (community) 2011-01-10 Approve on 2011-01-11
Review via email: mp+45775@code.launchpad.net

Description of the change

Hi!

This fixes the import of bzrlib.plugins.tarmac_land in the testsuite,
consistent with the rest of bzr-tarmacland.

To post a comment you must log in.
Ursula Junque (ursinha) wrote :

Thanks! This solves this problem. Approving...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_tarmac_land.py'
2--- tests/test_tarmac_land.py 2010-12-16 20:51:58 +0000
3+++ tests/test_tarmac_land.py 2011-01-10 22:29:57 +0000
4@@ -7,11 +7,7 @@
5
6 import unittest
7
8-from launchpadlib.uris import (
9- DEV_SERVICE_ROOT, EDGE_SERVICE_ROOT, LPNET_SERVICE_ROOT,
10- STAGING_SERVICE_ROOT)
11-
12-from bzrlib.plugins.bzr_tarmacland.tarmac_land import (
13+from bzrlib.plugins.tarmac_land.tarmac_land import (
14 get_bugs_clause, get_reviewer_clause,
15 get_reviewer_handle, get_testfix_clause, get_qa_clause,
16 MissingReviewError, MissingBugsError, MissingBugsIncrementalError,

Subscribers

People subscribed via source and target branches

to all changes: