← Back to branch summary

~viswesn/juju-ci-tools/aws_boto3

« back to all changes in this revision

Viewing changes to tests/test_assess_user_grant_revoke.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_user_grant_revoke.py
19
19
    main,
20
20
    parse_args,
21
21
)
22
 
from fakejuju import (
 
22
from jujupy import (
23
23
    fake_juju_client,
24
24
    FakeBackend,
 
25
    JUJU_DEV_FEATURE_FLAGS,
25
26
)
26
 
from jujupy import JUJU_DEV_FEATURE_FLAGS
27
27
from tests import (
28
28
    parse_error,
29
29
    TestCase,
123
123
            fake_admin_client = fake_juju_client()
124
124
            ac = patch("assess_user_grant_revoke.assert_admin_model",
125
125
                       return_value=True)
126
 
            with patch("jujupy.EnvJujuClient.revoke", return_value=True):
 
126
            with patch("jujupy.ModelClient.revoke", return_value=True):
127
127
                with patch("assess_user_grant_revoke.assert_read_model",
128
128
                           return_value=True) as read_mock:
129
129
                    with patch("assess_user_grant_revoke.assert_write_model",
185
185
                     autospec=True)
186
186
        log = patch("assess_user_grant_revoke.assert_logout_login",
187
187
                    autospec=True)
188
 
        expect = patch("jujupy.EnvJujuClient.expect",
 
188
        expect = patch("jujupy.ModelClient.expect",
189
189
                       autospec=True)
190
190
        read = patch("assess_user_grant_revoke.assert_read_model",
191
191
                     autospec=True)