← Back to branch summary

~juju-qa/juju-ci-tools/trunk

« back to all changes in this revision

Viewing changes to tests/test_assess_block.py

  • Committer: Curtis Hovey
  • Date: 2017-01-25 02:32:29 UTC
  • mfrom: (1855 trunk)
  • mto: This revision was merged to the branch mainline in revision 1865.
  • Revision ID: curtis@canonical.com-20170125023229-g7c6bzt0cqe1j8g3
Merged trunk and resolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_assess_block.py
12
12
    parse_args,
13
13
    )
14
14
from jujupy import (
15
 
    EnvJujuClient,
 
15
    ModelClient,
16
16
    EnvJujuClient1X,
17
17
    SimpleEnvironment
18
18
    )
79
79
        mock_client.list_disabled_commands.side_effect = [
80
80
            make_block_list(mock_client, []),
81
81
            make_block_list(
82
 
                mock_client, [EnvJujuClient.command_set_destroy_model]),
 
82
                mock_client, [ModelClient.command_set_destroy_model]),
83
83
            make_block_list(mock_client, []),
84
84
            make_block_list(
85
 
                mock_client, [EnvJujuClient.command_set_remove_object]),
 
85
                mock_client, [ModelClient.command_set_remove_object]),
86
86
            make_block_list(mock_client, []),
87
 
            make_block_list(mock_client, [EnvJujuClient.command_set_all]),
 
87
            make_block_list(mock_client, [ModelClient.command_set_all]),
88
88
            make_block_list(mock_client, []),
89
89
            ]
90
90
        mock_client.env.environment = 'foo'