Skip to content

Commit 5032dbc

Browse files
committed
Skip identity v2 functional tests
DevStack now uses identity v3 by default thus causing OSC to only load openstack.identity.v3 commands. This prevents running functional tests on openstack.identity.v2 commands. As a result, this patch set skips all identity v2 functional tests to unblock the gate. Change-Id: I066187318be71792a966fa21226fab0d406c3758 Partial-Bug: #1539780
1 parent c43bdc1 commit 5032dbc

9 files changed

Lines changed: 24 additions & 9 deletions

File tree

functional/tests/identity/v2/test_catalog.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from functional.tests.identity.v2 import test_identity
1416

1517

18+
@testtools.skip('bug/1539780')
1619
class CatalogTests(test_identity.IdentityTests):
1720

1821
def test_catalog_list(self):

functional/tests/identity/v2/test_ec2_credentials.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from functional.tests.identity.v2 import test_identity
1416

1517

18+
@testtools.skip('bug/1539780')
1619
class EC2CredentialsTests(test_identity.IdentityTests):
1720

1821
def test_ec2_credentials_create(self):

functional/tests/identity/v2/test_endpoint.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from functional.tests.identity.v2 import test_identity
1416

1517

18+
@testtools.skip('bug/1539780')
1619
class EndpointTests(test_identity.IdentityTests):
1720

1821
def test_endpoint_create(self):

functional/tests/identity/v2/test_project.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from tempest_lib.common.utils import data_utils
1416

1517
from functional.tests.identity.v2 import test_identity
1618

1719

20+
@testtools.skip('bug/1539780')
1821
class ProjectTests(test_identity.IdentityTests):
1922

2023
def test_project_create(self):

functional/tests/identity/v2/test_role.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from functional.tests.identity.v2 import test_identity
1416

1517

18+
@testtools.skip('bug/1539780')
1619
class RoleTests(test_identity.IdentityTests):
1720

1821
def test_role_create(self):

functional/tests/identity/v2/test_service.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from functional.tests.identity.v2 import test_identity
1416

1517

18+
@testtools.skip('bug/1539780')
1619
class ServiceTests(test_identity.IdentityTests):
1720

1821
def test_service_create(self):

functional/tests/identity/v2/test_token.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from functional.tests.identity.v2 import test_identity
1416

1517

18+
@testtools.skip('bug/1539780')
1619
class TokenTests(test_identity.IdentityTests):
1720

1821
def test_token_issue(self):

functional/tests/identity/v2/test_user.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
import testtools
14+
1315
from tempest_lib.common.utils import data_utils
1416

1517
from functional.common import exceptions
1618
from functional.tests.identity.v2 import test_identity
1719

1820

21+
@testtools.skip('bug/1539780')
1922
class UserTests(test_identity.IdentityTests):
2023

2124
def test_user_create(self):

functional/tests/identity/v3/test_identity.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13-
import os
14-
1513
from tempest_lib.common.utils import data_utils
1614

1715
from functional.common import test
@@ -49,13 +47,6 @@ def setUpClass(cls):
4947
if hasattr(super(IdentityTests, cls), 'setUpClass'):
5048
super(IdentityTests, cls).setUpClass()
5149

52-
# prepare v3 env
53-
auth_url = os.environ.get('OS_AUTH_URL')
54-
auth_url = auth_url.replace('v2.0', 'v3')
55-
os.environ['OS_AUTH_URL'] = auth_url
56-
os.environ['OS_IDENTITY_API_VERSION'] = '3'
57-
os.environ['OS_AUTH_TYPE'] = 'v3password'
58-
5950
# create dummy domain
6051
cls.domain_name = data_utils.rand_name('TestDomain')
6152
cls.domain_description = data_utils.rand_name('description')

0 commit comments

Comments
 (0)