Browse Source

Merge "Replace tempest-lib with tempest.lib"

changes/36/312836/1
Jenkins 6 years ago committed by Gerrit Code Review
parent
commit
515cee161c
  1. 2
      magnum/tests/functional/api/v1/clients/bay_client.py
  2. 4
      magnum/tests/functional/api/v1/test_bay.py
  3. 4
      magnum/tests/functional/api/v1/test_baymodel.py
  4. 2
      magnum/tests/functional/api/v1/test_magnum_service.py
  5. 2
      magnum/tests/functional/common/base.py
  6. 2
      magnum/tests/functional/common/client.py
  7. 2
      magnum/tests/functional/common/datagen.py
  8. 2
      test-requirements.txt

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

@ -11,7 +11,7 @@
# under the License.
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.common import client

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

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

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

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

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

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

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

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

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

@ -14,7 +14,7 @@ import abc
import six
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

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

@ -16,7 +16,7 @@ import socket
import string
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 baymodel_model

2
test-requirements.txt

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

Loading…
Cancel
Save