summaryrefslogtreecommitdiff
path: root/openstackclient/tests/identity
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2016-05-13 16:14:09 -0500
committerDean Troyer <dtroyer@gmail.com>2016-06-13 10:50:44 -0500
commite5e29a8fef7ba2396015918545a49e717fe75d15 (patch)
treec42c9581e6358c9327853e7800de0dfecc20a405 /openstackclient/tests/identity
parentd20c863ebc11cecaaefe043e615b2fb4f5f26063 (diff)
downloadpython-openstackclient-e5e29a8fef7ba2396015918545a49e717fe75d15.tar.gz
osc-lib: utils
Use osc-lib directly for utils. Leave openstackclient.common.utils for deprecation period. Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7
Diffstat (limited to 'openstackclient/tests/identity')
-rw-r--r--openstackclient/tests/identity/v2_0/test_user.py4
-rw-r--r--openstackclient/tests/identity/v3/test_project.py4
-rw-r--r--openstackclient/tests/identity/v3/test_user.py6
3 files changed, 7 insertions, 7 deletions
diff --git a/openstackclient/tests/identity/v2_0/test_user.py b/openstackclient/tests/identity/v2_0/test_user.py
index 921e215d..caf38a6f 100644
--- a/openstackclient/tests/identity/v2_0/test_user.py
+++ b/openstackclient/tests/identity/v2_0/test_user.py
@@ -152,7 +152,7 @@ class TestUserCreate(TestUser):
# data to be shown.
mocker = mock.Mock()
mocker.return_value = 'abc123'
- with mock.patch("openstackclient.common.utils.get_password", mocker):
+ with mock.patch("osc_lib.utils.get_password", mocker):
columns, data = self.cmd.take_action(parsed_args)
# Set expected values
@@ -638,7 +638,7 @@ class TestUserSet(TestUser):
mocker = mock.Mock()
mocker.return_value = 'abc123'
- with mock.patch("openstackclient.common.utils.get_password", mocker):
+ with mock.patch("osc_lib.utils.get_password", mocker):
result = self.cmd.take_action(parsed_args)
# UserManager.update_password(user, password)
diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
index 5be4e389..8fcada6e 100644
--- a/openstackclient/tests/identity/v3/test_project.py
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -202,7 +202,7 @@ class TestProjectCreate(TestProject):
mocker = mock.Mock()
mocker.return_value = None
- with mock.patch("openstackclient.common.utils.find_resource", mocker):
+ with mock.patch("osc_lib.utils.find_resource", mocker):
columns, data = self.cmd.take_action(parsed_args)
# Set expected values
@@ -549,7 +549,7 @@ class TestProjectList(TestProject):
mocker = mock.Mock()
mocker.return_value = None
- with mock.patch("openstackclient.common.utils.find_resource", mocker):
+ with mock.patch("osc_lib.utils.find_resource", mocker):
columns, data = self.cmd.take_action(parsed_args)
self.projects_mock.list.assert_called_with(
diff --git a/openstackclient/tests/identity/v3/test_user.py b/openstackclient/tests/identity/v3/test_user.py
index 5dafa772..85522e57 100644
--- a/openstackclient/tests/identity/v3/test_user.py
+++ b/openstackclient/tests/identity/v3/test_user.py
@@ -185,7 +185,7 @@ class TestUserCreate(TestUser):
# data to be shown.
mocker = mock.Mock()
mocker.return_value = 'abc123'
- with mock.patch("openstackclient.common.utils.get_password", mocker):
+ with mock.patch("osc_lib.utils.get_password", mocker):
columns, data = self.cmd.take_action(parsed_args)
# Set expected values
@@ -841,7 +841,7 @@ class TestUserSet(TestUser):
mocker = mock.Mock()
mocker.return_value = 'abc123'
- with mock.patch("openstackclient.common.utils.get_password", mocker):
+ with mock.patch("osc_lib.utils.get_password", mocker):
result = self.cmd.take_action(parsed_args)
# Set expected values
@@ -1023,7 +1023,7 @@ class TestUserSetPassword(TestUser):
@contextlib.contextmanager
def _mock_get_password(*passwords):
mocker = mock.Mock(side_effect=passwords)
- with mock.patch("openstackclient.common.utils.get_password", mocker):
+ with mock.patch("osc_lib.utils.get_password", mocker):
yield
def test_user_password_change(self):