diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2020-02-21 11:53:09 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2020-02-26 17:41:27 +0000 |
| commit | 7b2e5f3f72b54bf72e10a5d1304cd9823b222484 (patch) | |
| tree | fa16aeed9000beb4c8ae172eff2edbbc6bcc0a75 /openstack_auth/tests | |
| parent | 12faaf8dd391a43603c5a957b0189b852cc4954c (diff) | |
| download | horizon-7b2e5f3f72b54bf72e10a5d1304cd9823b222484.tar.gz | |
trivial: Remove now unused comments
These were helpful when flattening test cases. Not so much any more.
Change-Id: I4419f3787a709474fc25512a141c189b8d6cc996
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'openstack_auth/tests')
| -rw-r--r-- | openstack_auth/tests/unit/test_auth.py | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/openstack_auth/tests/unit/test_auth.py b/openstack_auth/tests/unit/test_auth.py index 8f0a467a3..5141f8867 100644 --- a/openstack_auth/tests/unit/test_auth.py +++ b/openstack_auth/tests/unit/test_auth.py @@ -134,12 +134,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, unscoped = self.data.unscoped_access_info form_data = self.get_form_data(user) - # mock authenticate - - # _mock_unscoped_and_domain_list_projects - - # _mock_unscoped_client - plugin = self._create_password_auth() plugin.get_access(mox.IsA(session.Session)). \ AndReturn(self.data.unscoped_access_info) @@ -147,8 +141,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=plugin) - # _mock_scoped_for_domain - url = settings.OPENSTACK_KEYSTONE_URL plugin = self._create_token_auth( @@ -169,13 +161,9 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, session=mox.IsA(session.Session), auth=plugin) - # _mock_unscoped_list_projects - client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) - # _mock_scoped_client_for_tenant - url = settings.OPENSTACK_KEYSTONE_URL token = self.data.unscoped_access_info.auth_token plugin = self._create_token_auth( @@ -199,8 +187,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, client = self.ks_client_module.Client(session=mox.IsA(session.Session), auth=plugin) - # _mock_unscoped_list_projects - client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) @@ -256,10 +242,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, # mock authenticate - # _mock_unscoped_and_domain_list_projects - - # _mock_unscoped_client - plugin = self._create_password_auth() plugin.get_access(mox.IsA(session.Session)). \ AndReturn(self.data.unscoped_access_info) @@ -267,8 +249,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=plugin) - # _mock_scoped_for_domain - url = settings.OPENSTACK_KEYSTONE_URL plugin = self._create_token_auth( @@ -289,13 +269,9 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, session=mox.IsA(session.Session), auth=plugin) - # _mock_unscoped_list_projects - client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) - # _mock_scoped_client_for_tenant - url = settings.OPENSTACK_KEYSTONE_URL token = self.data.unscoped_access_info.auth_token plugin = self._create_token_auth( @@ -320,8 +296,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, client = self.ks_client_module.Client(session=mox.IsA(session.Session), auth=plugin) - # _mock_unscoped_list_projects - client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) @@ -345,8 +319,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, sp_projects = [self.sp_data.project_one, self.sp_data.project_two] sp_unscoped = self.sp_data.federated_unscoped_access_info - # _mock_plugin - sp_unscoped_auth = self._create_token_auth( None, token=sp_unscoped.auth_token, @@ -355,33 +327,23 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, mox.IsA(session.Session)).AndReturn(sp_unscoped) sp_unscoped_auth.auth_url = settings.OPENSTACK_KEYSTONE_URL - # _mock_unscoped_token_client - sp_unscoped_auth.auth_url = plugin.auth_url client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=sp_unscoped_auth) - # _mock_unscoped_list_domains - client.auth = self.mox.CreateMockAnything() client.auth.domains().AndReturn(domains) - # _mock_unscoped_token_client - sp_unscoped_auth.auth_url = plugin.auth_url client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=sp_unscoped_auth) - # _mock_unscoped_federated_list_projects - client.federation = self.mox.CreateMockAnything() client.federation.projects = self.mox.CreateMockAnything() client.federation.projects.list().AndReturn(sp_projects) - # _mock_scoped_client_for_tenant - url = plugin.auth_url token = sp_unscoped.auth_token plugin = self._create_token_auth( @@ -430,10 +392,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, # mock authenticate - # _mock_unscoped_and_domain_list_projects - - # _mock_unscoped_client - plugin = self._create_password_auth() plugin.get_access(mox.IsA(session.Session)). \ AndReturn(self.data.unscoped_access_info) @@ -441,8 +399,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=plugin) - # _mock_scoped_for_domain - url = settings.OPENSTACK_KEYSTONE_URL plugin = self._create_token_auth( @@ -463,13 +419,9 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, session=mox.IsA(session.Session), auth=plugin) - # _mock_unscoped_list_projects - client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) - # _mock_scoped_client_for_tenant - url = settings.OPENSTACK_KEYSTONE_URL token = self.data.unscoped_access_info.auth_token plugin = self._create_token_auth( @@ -482,8 +434,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, session=mox.IsA(session.Session), auth=plugin) - # _mock_unscoped_token_client - if unscoped: plugin = self._create_token_auth( None, @@ -492,8 +442,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, plugin.get_access(mox.IsA(session.Session)).AndReturn(unscoped) plugin.auth_url = auth_url - # _mock_plugin - unscoped_auth = self._create_token_auth( None, token=unscoped.auth_token, @@ -501,32 +449,22 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, unscoped_auth.get_access(mox.IsA(session.Session)).AndReturn(unscoped) unscoped_auth.auth_url = settings.OPENSTACK_KEYSTONE_URL - # _mock_unscoped_token_client - unscoped_auth.auth_url = auth_url client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=unscoped_auth) - # _mock_unscoped_list_domains - client.auth = self.mox.CreateMockAnything() client.auth.domains().AndReturn(domains) - # _mock_unscoped_token_client - unscoped_auth.auth_url = auth_url client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=unscoped_auth) - # _mock_unscoped_list_projects - client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) - # _mock_scoped_client_for_tenant - url = settings.OPENSTACK_KEYSTONE_URL token = self.data.unscoped_access_info.auth_token plugin = self._create_token_auth( @@ -573,10 +511,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, # mock authenticate - # _mock_unscoped_and_domain_list_projects - - # _mock_unscoped_client - plugin = self._create_password_auth() plugin.get_access(mox.IsA(session.Session)). \ AndReturn(self.data.unscoped_access_info) @@ -584,8 +518,6 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=plugin) - # _mock_scoped_for_domain - url = settings.OPENSTACK_KEYSTONE_URL plugin = self._create_token_auth( @@ -606,13 +538,9 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, session=mox.IsA(session.Session), auth=plugin) - # _mock_unscoped_list_projects - client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) - # _mock_scoped_client_for_tenant - url = settings.OPENSTACK_KEYSTONE_URL token = self.data.unscoped_access_info.auth_token plugin = self._create_token_auth( @@ -774,8 +702,6 @@ class OpenStackAuthTestsWebSSO(OpenStackAuthTestsMixin, unscoped = self.data.federated_unscoped_access_info token = unscoped.auth_token - # _mock_plugin - unscoped_auth = self._create_token_auth( None, token=unscoped.auth_token, @@ -785,33 +711,23 @@ class OpenStackAuthTestsWebSSO(OpenStackAuthTestsMixin, form_data = {'token': token} - # _mock_unscoped_token_client - unscoped_auth.auth_url = settings.OPENSTACK_KEYSTONE_URL client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=unscoped_auth) - # _mock_unscoped_list_domains - client.auth = self.mox.CreateMockAnything() client.auth.domains().AndReturn(domains) - # _mock_unscoped_token_client - unscoped_auth.auth_url = settings.OPENSTACK_KEYSTONE_URL client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=unscoped_auth) - # _mock_unscoped_federated_list_projects - client.federation = self.mox.CreateMockAnything() client.federation.projects = self.mox.CreateMockAnything() client.federation.projects.list().AndReturn(projects) - # _mock_scoped_client_for_tenant - url = settings.OPENSTACK_KEYSTONE_URL token = self.data.unscoped_access_info.auth_token plugin = self._create_token_auth( @@ -841,8 +757,6 @@ class OpenStackAuthTestsWebSSO(OpenStackAuthTestsMixin, unscoped = self.data.federated_unscoped_access_info token = unscoped.auth_token - # _mock_plugin - unscoped_auth = self._create_token_auth( None, token=unscoped.auth_token, @@ -852,33 +766,23 @@ class OpenStackAuthTestsWebSSO(OpenStackAuthTestsMixin, form_data = {'token': token} - # _mock_unscoped_token_client - unscoped_auth.auth_url = settings.OPENSTACK_KEYSTONE_URL client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=unscoped_auth) - # _mock_unscoped_list_domains - client.auth = self.mox.CreateMockAnything() client.auth.domains().AndReturn(domains) - # _mock_unscoped_token_client - unscoped_auth.auth_url = settings.OPENSTACK_KEYSTONE_URL client = self.ks_client_module.Client( session=mox.IsA(session.Session), auth=unscoped_auth) - # _mock_unscoped_federated_list_projects - client.federation = self.mox.CreateMockAnything() client.federation.projects = self.mox.CreateMockAnything() client.federation.projects.list().AndReturn(projects) - # _mock_scoped_client_for_tenant - url = settings.OPENSTACK_KEYSTONE_URL token = self.data.unscoped_access_info.auth_token plugin = self._create_token_auth( |
