openstack
/
magnum
Code Issues Proposed changes

Merge "Replace tempest-lib with tempest.lib"

This commit is contained in:
Jenkins 2016-05-03 13:13:07 +00:00 committed by Gerrit Code Review
parent cd5214cc58 d560cbddff
commit 515cee161c
8 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/tests/functional/api/v1/clients/bay_client.py
View File

@ -11,7 +11,7 @@
# under the License. # under the License.
from oslo_log import log as logging from oslo_log import log as logging
from tempest_lib import exceptions from tempest.lib import exceptions
from magnum.tests.functional.api.v1.models import bay_model from magnum.tests.functional.api.v1.models import bay_model
from magnum.tests.functional.common import client from magnum.tests.functional.common import client

4
magnum/tests/functional/api/v1/test_bay.py
View File

@ -13,8 +13,8 @@
import fixtures import fixtures
from oslo_log import log as logging from oslo_log import log as logging
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import exceptions from tempest.lib import exceptions
import testtools import testtools
from magnum.objects.fields import BayStatus from magnum.objects.fields import BayStatus

4
magnum/tests/functional/api/v1/test_baymodel.py
View File

@ -11,8 +11,8 @@
# under the License. # under the License.
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import exceptions from tempest.lib import exceptions
import testtools import testtools
from magnum.tests.functional.common import base from magnum.tests.functional.common import base

2
magnum/tests/functional/api/v1/test_magnum_service.py
View File

@ -11,7 +11,7 @@
# under the License. # under the License.
from tempest_lib import exceptions from tempest.lib import exceptions
import testtools import testtools
from magnum.tests.functional.common import base from magnum.tests.functional.common import base

2
magnum/tests/functional/common/base.py
View File

@ -16,7 +16,7 @@ import os
import subprocess import subprocess
from tempest.common import credentials_factory as common_creds from tempest.common import credentials_factory as common_creds
from tempest_lib import base from tempest.lib import base
import magnum import magnum
from magnum.tests.functional.common import config from magnum.tests.functional.common import config

2
magnum/tests/functional/common/client.py
View File

@ -14,7 +14,7 @@ import abc
import six import six
from six.moves.urllib import parse from six.moves.urllib import parse
from tempest_lib.common import rest_client from tempest.lib.common import rest_client
from magnum.tests.functional.common import config from magnum.tests.functional.common import config

2
magnum/tests/functional/common/datagen.py
View File

@ -16,7 +16,7 @@ import socket
import string import string
import struct import struct
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from magnum.tests.functional.api.v1.models import bay_model from magnum.tests.functional.api.v1.models import bay_model
from magnum.tests.functional.api.v1.models import baymodel_model from magnum.tests.functional.api.v1.models import baymodel_model

2
test-requirements.txt
View File

@ -20,7 +20,5 @@ sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
tempest-lib>=0.14.0 # Apache-2.0
# releasenotes # releasenotes
reno>=1.6.2 # Apache2 reno>=1.6.2 # Apache2