openstack/python-openstackclient
Code Issues Proposed changes

Merge "Revert "Skip identity v2 functional tests""

Browse Source
This commit is contained in:
Jenkins 2016-02-02 00:03:35 +00:00 committed by Gerrit Code Review
commit e9ff42eee7
9 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functional/tests/identity/v2/test_catalog.py
View File

@ -10,12 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class CatalogTests(test_identity.IdentityTests): class CatalogTests(test_identity.IdentityTests):
def test_catalog_list(self): def test_catalog_list(self):

3
functional/tests/identity/v2/test_ec2_credentials.py
View File

@ -10,12 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class EC2CredentialsTests(test_identity.IdentityTests): class EC2CredentialsTests(test_identity.IdentityTests):
def test_ec2_credentials_create(self): def test_ec2_credentials_create(self):

3
functional/tests/identity/v2/test_endpoint.py
View File

@ -10,12 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class EndpointTests(test_identity.IdentityTests): class EndpointTests(test_identity.IdentityTests):
def test_endpoint_create(self): def test_endpoint_create(self):

3
functional/tests/identity/v2/test_project.py
View File

@ -10,14 +10,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from tempest_lib.common.utils import data_utils from tempest_lib.common.utils import data_utils
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class ProjectTests(test_identity.IdentityTests): class ProjectTests(test_identity.IdentityTests):
def test_project_create(self): def test_project_create(self):

3
functional/tests/identity/v2/test_role.py
View File

@ -10,12 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class RoleTests(test_identity.IdentityTests): class RoleTests(test_identity.IdentityTests):
def test_role_create(self): def test_role_create(self):

3
functional/tests/identity/v2/test_service.py
View File

@ -10,12 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class ServiceTests(test_identity.IdentityTests): class ServiceTests(test_identity.IdentityTests):
def test_service_create(self): def test_service_create(self):

3
functional/tests/identity/v2/test_token.py
View File

@ -10,12 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class TokenTests(test_identity.IdentityTests): class TokenTests(test_identity.IdentityTests):
def test_token_issue(self): def test_token_issue(self):

3
functional/tests/identity/v2/test_user.py
View File

@ -10,15 +10,12 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from tempest_lib.common.utils import data_utils from tempest_lib.common.utils import data_utils
from functional.common import exceptions from functional.common import exceptions
from functional.tests.identity.v2 import test_identity from functional.tests.identity.v2 import test_identity
@testtools.skip('bug/1539780')
class UserTests(test_identity.IdentityTests): class UserTests(test_identity.IdentityTests):
def test_user_create(self): def test_user_create(self):

9
functional/tests/identity/v3/test_identity.py
View File

@ -10,6 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import os
from tempest_lib.common.utils import data_utils from tempest_lib.common.utils import data_utils
from functional.common import test from functional.common import test
@ -47,6 +49,13 @@ class IdentityTests(test.TestCase):
if hasattr(super(IdentityTests, cls), 'setUpClass'): if hasattr(super(IdentityTests, cls), 'setUpClass'):
super(IdentityTests, cls).setUpClass() super(IdentityTests, cls).setUpClass()
# prepare v3 env
auth_url = os.environ.get('OS_AUTH_URL')
auth_url = auth_url.replace('v2.0', 'v3')
os.environ['OS_AUTH_URL'] = auth_url
os.environ['OS_IDENTITY_API_VERSION'] = '3'
os.environ['OS_AUTH_TYPE'] = 'v3password'
# create dummy domain # create dummy domain
cls.domain_name = data_utils.rand_name('TestDomain') cls.domain_name = data_utils.rand_name('TestDomain')
cls.domain_description = data_utils.rand_name('description') cls.domain_description = data_utils.rand_name('description')