launchpad-reviewers team mailing list archive

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

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

Commit message:
When the home page displays "LocalSettings.php not found", it's because the relation is not yet established.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

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

=== modified file 'maas-integration.py'
--- maas-integration.py	2012-12-13 14:44:08 +0000
+++ maas-integration.py	2012-12-14 13:32:39 +0000
@@ -462,7 +462,11 @@
             except urllib2.URLError:
                 pass
             else:
-                if 'database error' not in homepage:
+                temporary_failures = (
+                    'database error' in homepage or
+                    "LocalSettings.php not found" in homepage
+                    )
+                if not temporary_failures:
                     break
             sleep(15)