← Back to branch summary

~brendan-donegan/maas/qa-lab-tests_boot_resources_2.0

« back to all changes in this revision

Viewing changes to maas-integration.py

  • Committer: Brendan Donegan
  • Date: 2016-06-15 09:14:06 UTC
  • mto: This revision was merged to the branch mainline in revision 435.
  • Revision ID: brendan.donegan@canonical.com-20160615091406-ihiualsw1pqxbazq
Actually do use postgres as the ubuntu charm doesn't work

Show diffs side-by-side

added added

removed removed

Lines of Context:
maas-integration.py
220
220
    "test_juju_bootstrap",
221
221
    "test_apply_tag_to_all_machines",
222
222
    "test_check_tag_applied_to_all_machines",
223
 
    "test_juju_deploy_ubuntu",
 
223
    "test_juju_deploy_postgresql",
224
224
    "test_machines_deployed",
225
225
    "test_ip_addresses_not_in_dynamic_range",
226
226
]
1024
1024
            self.assertThat(retcode, Equals(0))
1025
1025
 
1026
1026
    @skipIf(DO_NOT_TEST_JUJU, "Not testing juju")
1027
 
    def test_juju_deploy_ubuntu(self):
 
1027
    def test_juju_deploy_postgresql(self):
1028
1028
        # Deploy postgresql.
1029
1029
        env = os.environ.copy()
1030
1030
        env['http_proxy'] = HTTP_PROXY
1031
1031
        env['https_proxy'] = HTTP_PROXY
1032
 
        retcode, _, _ = self._run_juju_command(["deploy", "ubuntu"], env=env)
 
1032
        retcode, _, _ = self._run_juju_command(["deploy", "postgresql"], env=env)
1033
1033
        self.assertThat(retcode, Equals(0))
1034
1034
        self._wait_machines_running(1)
1035
 
        self._wait_units_started('ubuntu', 1)
 
1035
        self._wait_units_started('postgresql', 1)
1036
1036
 
1037
1037
    nb_of_deployed_machines = 2
1038
1038