~abentley/juju-ci-tools/client-from-config-4

« back to all changes in this revision

Viewing changes to tests/test_quickstart_deploy.py

  • Committer: Aaron Bentley
  • Date: 2016-07-05 14:15:26 UTC
  • mfrom: (1468.1.6 client-from-config-3)
  • Revision ID: aaron.bentley@canonical.com-20160705141526-v1gveg82a4swb3fb
Merged client-from-config-3 into client-from-config-4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
85
85
        with patch('deploy_stack.get_machine_dns_name',
86
86
                   return_value='mocked_name') as dns_mock:
87
87
            # Test second yield
88
 
            with patch.object(client, 'get_admin_client') as gac_mock:
 
88
            with patch.object(client, 'get_controller_client') as gcc_mock:
89
89
                step = steps.next()
90
 
        dns_mock.assert_called_once_with(gac_mock.return_value, '0')
 
90
        dns_mock.assert_called_once_with(gcc_mock.return_value, '0')
91
91
        self.assertEqual('mocked_name', step['bootstrap_host'])
92
92
        with patch.object(client, 'wait_for_deploy_started') as wds_mock:
93
93
            # Test third yield