launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/broken-import into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~jtv/maas/broken-import/+merge/121386

How did we ever fail to notice this?  It must mean that Jenkins is broken in some way.  We may also have some other test problems (also being looked into) that may have been obscuring this one.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/broken-import/+merge/121386
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/broken-import into lp:maas.

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2012-08-24 16:11:02 +0000
+++ src/maasserver/tests/test_api.py	2012-08-27 09:21:19 +0000
@@ -51,7 +51,6 @@
     )
 from maasserver.exceptions import Unauthorized
 from maasserver.fields import mac_error_msg
-from maasserver.kernel import compose_enlistment_preseed_url
 from maasserver.models import (
     Config,
     DHCPLease,
@@ -63,7 +62,10 @@
     create_auth_token,
     get_auth_tokens,
     )
-from maasserver.preseed import compose_preseed_url
+from maasserver.preseed import (
+    compose_enlistment_preseed_url,
+    compose_preseed_url,
+    )
 from maasserver.refresh_worker import refresh_worker
 from maasserver.testing import (
     reload_object,