← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to tests/test_quickstart_deploy.py

  • Committer: Christopher Lee
  • Date: 2016-10-30 23:17:23 UTC
  • mfrom: (1697 trunk)
  • mto: This revision was merged to the branch mainline in revision 1698.
  • Revision ID: chris.lee@canonical.com-20161030231723-weuexhcfcp9jkz0i
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_quickstart_deploy.py
76
76
        with patch.object(client, 'quickstart') as qs_mock:
77
77
            # Test first yield
78
78
            with patch('jujupy.check_free_disk_space', autospec=True):
79
 
                with patch('deploy_stack.tear_down', autospec=True) as td_mock:
 
79
                with patch.object(client, 'kill_controller',
 
80
                                  autospec=True) as kill_mock:
80
81
                    step = steps.next()
81
 
        td_mock.assert_called_once_with(client, 'jes_enabled', try_jes=True)
 
82
        kill_mock.assert_called_once_with()
82
83
        qs_mock.assert_called_once_with('/tmp/bundle.yaml')
83
84
        expected = {'juju-quickstart': 'Returned from quickstart'}
84
85
        self.assertEqual(expected, step)
100
101
        ws_mock.assert_called_once_with(ANY)
101
102
        self.assertEqual('All Agents started', step['agents_started'])
102
103
        with patch('deploy_stack.safe_print_status'):
103
 
            with patch('deploy_stack.tear_down'):
 
104
            with patch('deploy_stack.BootstrapManager.tear_down'):
104
105
                with patch('quickstart_deploy.BootstrapManager.dump_all_logs'):
105
106
                    with patch('jujupy.EnvJujuClient.iter_model_clients',
106
107
                               return_value=[]):