← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~matsubara/maas/fix-cc-match into lp:~maas-maintainers/maas/qa-lab-tests

 

Diogo Matsubara has proposed merging lp:~matsubara/maas/fix-cc-match into lp:~maas-maintainers/maas/qa-lab-tests.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1172303 in MAAS: "MAAS_URL on maas_cluster.conf is quoted on quantal but not quoted on raring"
  https://bugs.launchpad.net/maas/+bug/1172303

For more details, see:
https://code.launchpad.net/~matsubara/maas/fix-cc-match/+merge/161223

This branch fixes the cluster controller test to look to double quotes now that all packaging branches are consistent.
-- 
https://code.launchpad.net/~matsubara/maas/fix-cc-match/+merge/161223
Your team MAAS Maintainers is requested to review the proposed merge of lp:~matsubara/maas/fix-cc-match into lp:~maas-maintainers/maas/qa-lab-tests.
=== modified file 'cluster-controller-integration.py'
--- cluster-controller-integration.py	2013-04-23 23:05:02 +0000
+++ cluster-controller-integration.py	2013-04-26 20:19:25 +0000
@@ -30,7 +30,7 @@
         maas_fd = open("/etc/maas/maas_cluster.conf" , "r+")
         maas_file = maas_fd.read()
         self.assertThat(maas_file, Contains(
-            "MAAS_URL='http://192.168.21.5/MAAS'"))
+            'MAAS_URL="http://192.168.21.5/MAAS";'))
 
     def test_update_pxe_config(self):
         update_pxe_config()