← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/test_assess_recovery.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:
tests/test_assess_recovery.py
64
64
        client.bootstrap()
65
65
 
66
66
        def terminate(env, instance_ids):
 
67
            model = client._backend.controller_state.controller_model
67
68
            for instance_id in instance_ids:
68
 
                admin_model = client._backend.controller_state.admin_model
69
 
                admin_model.remove_state_server(instance_id)
 
69
                model.remove_state_server(instance_id)
70
70
 
71
71
        with patch('assess_recovery.wait_for_state_server_to_shutdown',
72
72
                   autospec=True):
93
93
        with self.assess_recovery_cxt(client):
94
94
            assess_recovery(bs_manager, 'ha-backup', 'trusty')
95
95
 
96
 
    def test_admin_model_backup(self):
 
96
    def test_controller_model_backup(self):
97
97
        client = fake_juju_client()
98
98
        bs_manager = Mock(client=client, known_hosts={})
99
99
        with self.assess_recovery_cxt(client):
100
100
            assess_recovery(bs_manager, 'backup', 'trusty')
101
101
 
102
 
    def test_admin_model_ha(self):
 
102
    def test_controller_model_ha(self):
103
103
        client = fake_juju_client()
104
104
        bs_manager = Mock(client=client, known_hosts={})
105
105
        with self.assess_recovery_cxt(client):
106
106
            assess_recovery(bs_manager, 'ha', 'trusty')
107
107
 
108
 
    def test_admin_model_ha_backup(self):
 
108
    def test_controller_model_ha_backup(self):
109
109
        client = fake_juju_client()
110
110
        bs_manager = Mock(client=client, known_hosts={})
111
111
        with self.assess_recovery_cxt(client):