summaryrefslogtreecommitdiff
path: root/openstackclient/tests
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/tests')
-rw-r--r--openstackclient/tests/identity/v3/test_identity_provider.py29
-rw-r--r--openstackclient/tests/identity/v3/test_oauth.py10
-rw-r--r--openstackclient/tests/image/v1/test_image.py2
-rw-r--r--openstackclient/tests/test_shell.py63
4 files changed, 62 insertions, 42 deletions
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py
index cac68f1d..280d9227 100644
--- a/openstackclient/tests/identity/v3/test_identity_provider.py
+++ b/openstackclient/tests/identity/v3/test_identity_provider.py
@@ -24,9 +24,8 @@ class TestIdentityProvider(identity_fakes.TestFederatedIdentity):
def setUp(self):
super(TestIdentityProvider, self).setUp()
- self.identity_providers_mock = self.app.client_manager.\
- identity.identity_providers
-
+ identity_lib = self.app.client_manager.identity
+ self.identity_providers_mock = identity_lib.identity_providers
self.identity_providers_mock.reset_mock()
@@ -35,17 +34,10 @@ class TestIdentityProviderCreate(TestIdentityProvider):
def setUp(self):
super(TestIdentityProviderCreate, self).setUp()
- self.identity_providers_mock.create.return_value = \
- fakes.FakeResource(
- None,
- copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
- loaded=True,
- )
-
- self.cmd = identity_provider.CreateIdentityProvider(
- self.app,
- None,
- )
+ copied_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER)
+ resource = fakes.FakeResource(None, copied_idp, loaded=True)
+ self.identity_providers_mock.create.return_value = resource
+ self.cmd = identity_provider.CreateIdentityProvider(self.app, None)
def test_create_identity_provider_no_options(self):
arglist = [
@@ -116,12 +108,9 @@ class TestIdentityProviderCreate(TestIdentityProvider):
IDENTITY_PROVIDER['enabled'] = False
IDENTITY_PROVIDER['description'] = None
- self.identity_providers_mock.create.return_value = \
- fakes.FakeResource(
- None,
- IDENTITY_PROVIDER,
- loaded=True,
- )
+ resource = fakes.FakeResource(None, IDENTITY_PROVIDER, loaded=True)
+ self.identity_providers_mock.create.return_value = resource
+
arglist = [
'--disable',
identity_fakes.idp_id,
diff --git a/openstackclient/tests/identity/v3/test_oauth.py b/openstackclient/tests/identity/v3/test_oauth.py
index f796d476..15ba04e3 100644
--- a/openstackclient/tests/identity/v3/test_oauth.py
+++ b/openstackclient/tests/identity/v3/test_oauth.py
@@ -77,13 +77,9 @@ class TestRequestTokenAuthorize(TestOAuth1):
def setUp(self):
super(TestRequestTokenAuthorize, self).setUp()
- self.request_tokens_mock.authorize.return_value = \
- fakes.FakeResource(
- None,
- copy.deepcopy(identity_fakes.OAUTH_VERIFIER),
- loaded=True,
- )
-
+ copied_verifier = copy.deepcopy(identity_fakes.OAUTH_VERIFIER)
+ resource = fakes.FakeResource(None, copied_verifier, loaded=True)
+ self.request_tokens_mock.authorize.return_value = resource
self.cmd = token.AuthorizeRequestToken(self.app, None)
def test_authorize_request_tokens(self):
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index b746a538..b014482a 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -139,7 +139,7 @@ class TestImageCreate(TestImage):
self.assertEqual(image_fakes.IMAGE_columns, columns)
self.assertEqual(image_fakes.IMAGE_data, data)
- @mock.patch('__builtin__.open')
+ @mock.patch('six.moves.builtins.open')
def test_image_create_file(self, open_mock):
mock_exception = {
'find.side_effect': exceptions.CommandError('x'),
diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py
index 2ee8503a..dfb8021a 100644
--- a/openstackclient/tests/test_shell.py
+++ b/openstackclient/tests/test_shell.py
@@ -104,6 +104,8 @@ class TestShell(utils.TestCase):
default_args["password"])
self.assertEqual(_shell.options.os_region_name,
default_args["region_name"])
+ self.assertEqual(_shell.options.os_trust_id,
+ default_args["trust_id"])
def _assert_token_auth(self, cmd_options, default_args):
with mock.patch("openstackclient.shell.OpenStackShell.initialize_app",
@@ -181,7 +183,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -199,7 +202,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -217,7 +221,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -235,7 +240,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -253,7 +259,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -271,7 +278,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -289,7 +297,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -307,7 +316,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -325,7 +335,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -343,7 +354,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -361,7 +373,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": DEFAULT_PROJECT_DOMAIN_NAME,
"username": "",
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -379,7 +392,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": DEFAULT_USERNAME,
"password": "",
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -397,7 +411,8 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": DEFAULT_PASSWORD,
- "region_name": ""
+ "region_name": "",
+ "trust_id": "",
}
self._assert_password_auth(flag, kwargs)
@@ -415,7 +430,27 @@ class TestShellPasswordAuth(TestShell):
"project_domain_name": "",
"username": "",
"password": "",
- "region_name": DEFAULT_REGION_NAME
+ "region_name": DEFAULT_REGION_NAME,
+ "trust_id": "",
+ }
+ self._assert_password_auth(flag, kwargs)
+
+ def test_only_trust_id_flow(self):
+ flag = "--os-trust-id " + "1234"
+ kwargs = {
+ "auth_url": "",
+ "project_id": "",
+ "project_name": "",
+ "domain_id": "",
+ "domain_name": "",
+ "user_domain_id": "",
+ "user_domain_name": "",
+ "project_domain_id": "",
+ "project_domain_name": "",
+ "username": "",
+ "password": "",
+ "region_name": "",
+ "trust_id": "1234",
}
self._assert_password_auth(flag, kwargs)
View Lorry Controller Status