summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Duarte Sousa <rodrigo@waltznetworks.com>2017-11-14 12:31:10 -0300
committerRodrigo Duarte Sousa <rodrigo@waltznetworks.com>2017-11-14 12:32:02 -0300
commit43508b8db7501f44e4c7f435ddb11486fdcdfa38 (patch)
tree0165aa78aef4094d383dcee7aa3cb4622e82bb6d
parent27979b9756623d677a5ada86bd5eced2c215cf8d (diff)
downloadpython-keystoneclient-43508b8db7501f44e4c7f435ddb11486fdcdfa38.tar.gz
Remove functional tests for v2.0 API
Change-Id: I207b716e47893931e79e3758abc2bd879917f340
-rw-r--r--keystoneclient/tests/functional/base.py4
-rw-r--r--keystoneclient/tests/functional/test_access.py50
-rw-r--r--keystoneclient/tests/functional/test_base.py7
-rw-r--r--keystoneclient/tests/functional/v2_0/__init__.py0
4 files changed, 0 insertions, 61 deletions
diff --git a/keystoneclient/tests/functional/base.py b/keystoneclient/tests/functional/base.py
index 743cb50..a8a12e0 100644
--- a/keystoneclient/tests/functional/base.py
+++ b/keystoneclient/tests/functional/base.py
@@ -83,7 +83,3 @@ class ClientTestCase(testtools.TestCase):
class V3ClientTestCase(ClientTestCase):
version = '3'
-
-
-class V2ClientTestCase(ClientTestCase):
- version = '2.0'
diff --git a/keystoneclient/tests/functional/test_access.py b/keystoneclient/tests/functional/test_access.py
deleted file mode 100644
index 0b202fb..0000000
--- a/keystoneclient/tests/functional/test_access.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.
-
-import os
-
-import testtools
-
-from keystoneclient.auth.identity import v2
-from keystoneclient import session
-from tempest.lib import base
-
-
-class TestV2AccessInfo(base.BaseTestCase):
-
- def setUp(self):
- super(TestV2AccessInfo, self).setUp()
-
- self.session = session.Session()
-
- @testtools.skip("likely race condition, being skipped")
- def test_access_audit_id(self):
- unscoped_plugin = v2.Password(auth_url=os.environ.get('OS_AUTH_URL'),
- username=os.environ.get('OS_USERNAME'),
- password=os.environ.get('OS_PASSWORD'))
-
- unscoped_auth_ref = unscoped_plugin.get_access(self.session)
-
- self.assertIsNotNone(unscoped_auth_ref.audit_id)
- self.assertIsNone(unscoped_auth_ref.audit_chain_id)
-
- scoped_plugin = v2.Token(auth_url=os.environ.get('OS_AUTH_URL'),
- token=unscoped_auth_ref.auth_token,
- tenant_name=os.environ.get('OS_TENANT_NAME'))
-
- scoped_auth_ref = scoped_plugin.get_access(self.session)
-
- self.assertIsNotNone(scoped_auth_ref.audit_id)
- self.assertIsNotNone(scoped_auth_ref.audit_chain_id)
-
- self.assertEqual(unscoped_auth_ref.audit_id,
- scoped_auth_ref.audit_chain_id)
diff --git a/keystoneclient/tests/functional/test_base.py b/keystoneclient/tests/functional/test_base.py
index d5f0516..091fc77 100644
--- a/keystoneclient/tests/functional/test_base.py
+++ b/keystoneclient/tests/functional/test_base.py
@@ -19,10 +19,3 @@ class V3ClientVersionTestCase(base.V3ClientTestCase):
def test_version(self):
self.assertIsInstance(self.client,
keystoneclient.v3.client.Client)
-
-
-class V2ClientVersionTestCase(base.V2ClientTestCase):
-
- def test_version(self):
- self.assertIsInstance(self.client,
- keystoneclient.v2_0.client.Client)
diff --git a/keystoneclient/tests/functional/v2_0/__init__.py b/keystoneclient/tests/functional/v2_0/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/keystoneclient/tests/functional/v2_0/__init__.py
+++ /dev/null