launchpad-reviewers team mailing list archive

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

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

Commit message:
Do not set constraints on precise (juju does not support the constraint 'arch').  Fix timeout as it takes ages to bootstrap on a ARM node.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

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

=== modified file 'maas-integration.py'
--- maas-integration.py	2012-12-07 14:05:34 +0000
+++ maas-integration.py	2012-12-13 14:46:21 +0000
@@ -8,6 +8,7 @@
 from testtools.content import text_content
 from unittest import skipIf
 import yaml
+import platform
 import urllib2
 
 from timeout import timeout
@@ -384,7 +385,7 @@
         return output
 
     @skipIf(DO_NOT_TEST_JUJU, "Not testing juju")
-    @timeout(30*60)
+    @timeout(50*60)
     def test_15_juju_bootstrap(self):
         self.setup_juju()
         self._run_juju_command(['bootstrap'])
@@ -427,7 +428,8 @@
     def test_16_juju_setup(self):
         # Deploy mediawiki with its mysql db.
         self._run_juju_command(["deploy", "mysql"])
-        if USE_ARM_NODES:
+        is_precise = platform.linux_distribution()[2] == 'precise'
+        if USE_ARM_NODES and not is_precise:
             self._run_juju_command(
                 ["deploy", "mediawiki", "--constraints", "arch=arm"])
         else: