From b46985ee879a5f83b2cd87334229c83f7cb4b103 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Tue, 15 Sep 2015 14:38:46 +1000 Subject: [PATCH] Move generic loading tests into loading folder There are two tests for loading options for generic plugins that were in the regular plugin folder and not the loading folder. Move them. Change-Id: Id0b1508afd20be84fb33154c18119da3b0674c3c --- .../tests/unit/identity/test_password.py | 22 ------- .../tests/unit/identity/test_token.py | 17 ------ .../tests/unit/loading/test_generic.py | 57 +++++++++++++++++++ 3 files changed, 57 insertions(+), 39 deletions(-) create mode 100644 keystoneauth1/tests/unit/loading/test_generic.py diff --git a/keystoneauth1/tests/unit/identity/test_password.py b/keystoneauth1/tests/unit/identity/test_password.py index 1f6116d0..6657fe01 100644 --- a/keystoneauth1/tests/unit/identity/test_password.py +++ b/keystoneauth1/tests/unit/identity/test_password.py @@ -16,7 +16,6 @@ from keystoneauth1.identity.generic import password from keystoneauth1.identity import v2 from keystoneauth1.identity import v3 from keystoneauth1.identity.v3 import password as v3_password -from keystoneauth1.loading._plugins.identity import generic from keystoneauth1.tests.unit.identity import utils @@ -51,27 +50,6 @@ class PasswordTests(utils.GenericPluginTestCase): self.assertDiscoveryFailure(domain_id=uuid.uuid4().hex, auth_url=auth_url) - def test_options(self): - opts = [o.name for o in generic.Password().get_options()] - - allowed_opts = ['user-name', - 'user-domain-id', - 'user-domain-name', - 'user-id', - 'password', - - 'domain-id', - 'domain-name', - 'project-id', - 'project-name', - 'project-domain-id', - 'project-domain-name', - 'trust-id', - 'auth-url'] - - self.assertEqual(set(allowed_opts), set(opts)) - self.assertEqual(len(allowed_opts), len(opts)) - def test_symbols(self): self.assertIs(v3.Password, v3_password.Password) self.assertIs(v3.PasswordMethod, v3_password.PasswordMethod) diff --git a/keystoneauth1/tests/unit/identity/test_token.py b/keystoneauth1/tests/unit/identity/test_token.py index f7471d21..c70be03a 100644 --- a/keystoneauth1/tests/unit/identity/test_token.py +++ b/keystoneauth1/tests/unit/identity/test_token.py @@ -16,7 +16,6 @@ from keystoneauth1.identity.generic import token from keystoneauth1.identity import v2 from keystoneauth1.identity import v3 from keystoneauth1.identity.v3 import token as v3_token -from keystoneauth1.loading._plugins.identity import generic from keystoneauth1.tests.unit.identity import utils @@ -30,22 +29,6 @@ class TokenTests(utils.GenericPluginTestCase): kwargs.setdefault('token', uuid.uuid4().hex) return super(TokenTests, self).new_plugin(**kwargs) - def test_options(self): - opts = [o.name for o in generic.Token().get_options()] - - allowed_opts = ['token', - 'domain-id', - 'domain-name', - 'project-id', - 'project-name', - 'project-domain-id', - 'project-domain-name', - 'trust-id', - 'auth-url'] - - self.assertEqual(set(allowed_opts), set(opts)) - self.assertEqual(len(allowed_opts), len(opts)) - def test_symbols(self): self.assertIs(v3.Token, v3_token.Token) self.assertIs(v3.TokenMethod, v3_token.TokenMethod) diff --git a/keystoneauth1/tests/unit/loading/test_generic.py b/keystoneauth1/tests/unit/loading/test_generic.py new file mode 100644 index 00000000..d4bcdeaf --- /dev/null +++ b/keystoneauth1/tests/unit/loading/test_generic.py @@ -0,0 +1,57 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from keystoneauth1.loading._plugins.identity import generic +from keystoneauth1.tests.unit.loading import utils + + +class PasswordTests(utils.TestCase): + + def test_options(self): + opts = [o.name for o in generic.Password().get_options()] + + allowed_opts = ['user-name', + 'user-domain-id', + 'user-domain-name', + 'user-id', + 'password', + + 'domain-id', + 'domain-name', + 'project-id', + 'project-name', + 'project-domain-id', + 'project-domain-name', + 'trust-id', + 'auth-url'] + + self.assertEqual(set(allowed_opts), set(opts)) + self.assertEqual(len(allowed_opts), len(opts)) + + +class TokenTests(utils.TestCase): + + def test_options(self): + opts = [o.name for o in generic.Token().get_options()] + + allowed_opts = ['token', + 'domain-id', + 'domain-name', + 'project-id', + 'project-name', + 'project-domain-id', + 'project-domain-name', + 'trust-id', + 'auth-url'] + + self.assertEqual(set(allowed_opts), set(opts)) + self.assertEqual(len(allowed_opts), len(opts))