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

« back to all changes in this revision

Viewing changes to tests/test_assess_unregister.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:
11
11
from textwrap import dedent
12
12
 
13
13
import assess_unregister as a_unreg
14
 
from fakejuju import fake_juju_client
 
14
from jujupy import fake_juju_client
15
15
from tests import (
16
16
    parse_error,
17
17
    TestCase,
64
64
 
65
65
    def test_unregister(self):
66
66
        fake_user = Mock()
67
 
        with patch('jujupy.EnvJujuClient.register_user',
 
67
        with patch('jujupy.ModelClient.register_user',
68
68
                   return_value=fake_user):
69
69
            with patch.object(
70
70
                    a_unreg, 'assert_controller_list',