launchpad-reviewers team mailing list archive

[Diogo Matsubara <matsubara@xxxxxxxxxxxxx>]

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

Requested reviews:
  MAAS Maintainers (maas-maintainers)

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

This branch changes two things:
 - test_setup_dhcp_region() to use the apparmor workaround described on bug 1107686 on quantal.
 - the way we match for the MAAS_URL in the cluster controller test_preseed_updated_cluster_config()
-- 
https://code.launchpad.net/~matsubara/maas/fix-maas-cc-cluster-config-match/+merge/160540
Your team MAAS Maintainers is requested to review the proposed merge of lp:~matsubara/maas/fix-maas-cc-cluster-config-match into lp:~maas-maintainers/maas/qa-lab-tests.

=== modified file 'cluster-controller-integration.py'
--- cluster-controller-integration.py	2013-02-26 17:27:31 +0000
+++ cluster-controller-integration.py	2013-04-24 03:16:32 +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()

=== modified file 'maas-integration.py'
--- maas-integration.py	2013-04-23 18:36:24 +0000
+++ maas-integration.py	2013-04-24 03:16:32 +0000
@@ -350,7 +350,8 @@
 
     @timeout(5*60)
     def test_set_up_dhcp_region(self):
-        if "raring" in platform.linux_distribution():
+        release = platform.linux_distribution()[2]
+        if release in ('quantal', 'raring'):
             self._update_dhcpd_apparmor_profile()
 
         region_uuid = get_local_cluster_UUID()