launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/qa-lab-tests-port into lp:~maas-maintainers/maas/qa-lab-tests.

Commit message:
Workaround bug 972829: explicitly specify the port to be used.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~rvb/maas/qa-lab-tests-port/+merge/138407
-- 
https://code.launchpad.net/~rvb/maas/qa-lab-tests-port/+merge/138407
Your team MAAS Maintainers is requested to review the proposed merge of lp:~rvb/maas/qa-lab-tests-port into lp:~maas-maintainers/maas/qa-lab-tests.

=== modified file 'debian/tests/maas-integration.py'
--- debian/tests/maas-integration.py	2012-12-05 15:54:42 +0000
+++ debian/tests/maas-integration.py	2012-12-06 10:33:22 +0000
@@ -336,7 +336,9 @@
         setup_deb_proxy()
         setup_ssh()
         token_str = get_token_str()
-        setup_juju_config(MAAS_URL, token_str, series=self.NODE_SERIES)
+        # Workaround bug 972829 (in juju precise).
+        server_url = MAAS_URL.replace('/MAAS', ':80/MAAS')
+        setup_juju_config(server_url, token_str, series=self.NODE_SERIES)
         setup_local_dns()
 
     def _run_juju_command(self, args):