openstack/designate
Code Issues Proposed changes

Merge "Use tempest.lib instead of tempest-lib"

Browse Source
This commit is contained in:
Jenkins 2016-08-21 14:56:17 +00:00 committed by Gerrit Code Review
commit 7bb1b45919
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functionaltests/api/v2/base.py
View File

@ -15,7 +15,7 @@ limitations under the License.
""" """
from oslo_config import cfg from oslo_config import cfg
from tempest_lib import exceptions from tempest.lib import exceptions
from functionaltests.api.v2.clients.quotas_client import QuotasClient from functionaltests.api.v2.clients.quotas_client import QuotasClient
from functionaltests.api.v2.clients.tld_client import TLDClient from functionaltests.api.v2.clients.tld_client import TLDClient

2
functionaltests/api/v2/clients/recordset_client.py
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
from tempest_lib.exceptions import NotFound from tempest.lib.exceptions import NotFound
from functionaltests.api.v2.models.recordset_model import RecordsetModel from functionaltests.api.v2.models.recordset_model import RecordsetModel
from functionaltests.api.v2.models.recordset_model import RecordsetListModel from functionaltests.api.v2.models.recordset_model import RecordsetListModel

4
functionaltests/api/v2/clients/zone_client.py
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
from tempest_lib.exceptions import NotFound from tempest.lib.exceptions import NotFound
from functionaltests.api.v2.models.zone_model import ZoneModel from functionaltests.api.v2.models.zone_model import ZoneModel
from functionaltests.api.v2.models.zone_model import ZoneListModel from functionaltests.api.v2.models.zone_model import ZoneListModel
@ -70,7 +70,7 @@ class ZoneClient(ClientMixin):
def is_zone_404(self, zone_id): def is_zone_404(self, zone_id):
try: try:
# tempest_lib rest client raises exceptions on bad status codes # tempest.lib rest client raises exceptions on bad status codes
resp, model = self.get_zone(zone_id) resp, model = self.get_zone(zone_id)
except NotFound: except NotFound:
return True return True

2
functionaltests/api/v2/fixtures.py
View File

@ -20,7 +20,7 @@ import sys
import traceback import traceback
import fixtures import fixtures
from tempest_lib.exceptions import NotFound from tempest.lib.exceptions import NotFound
from testtools.runtest import MultipleExceptions from testtools.runtest import MultipleExceptions
from functionaltests.api.v2.clients.blacklist_client import BlacklistClient from functionaltests.api.v2.clients.blacklist_client import BlacklistClient

2
functionaltests/api/v2/test_recordset.py
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
import dns.rdatatype import dns.rdatatype
from tempest_lib import exceptions from tempest.lib import exceptions
from functionaltests.common import datagen from functionaltests.common import datagen
from functionaltests.common import dnsclient from functionaltests.common import dnsclient

2
functionaltests/api/v2/test_recordset_validation.py
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
from tempest_lib import exceptions from tempest.lib import exceptions
from functionaltests.common import datagen from functionaltests.common import datagen
from functionaltests.common import utils from functionaltests.common import utils

2
functionaltests/api/v2/test_zone_ownership_transfers.py
View File

@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
from tempest_lib import exceptions from tempest.lib import exceptions
from functionaltests.common import datagen from functionaltests.common import datagen
from functionaltests.common import utils from functionaltests.common import utils

4
functionaltests/common/base.py
View File

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
import tempest_lib.base import tempest.lib.base
from functionaltests.common.config import read_config from functionaltests.common.config import read_config
class BaseDesignateTest(tempest_lib.base.BaseTestCase): class BaseDesignateTest(tempest.lib.base.BaseTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):

6
functionaltests/common/client.py
View File

@ -21,9 +21,9 @@ from config import cfg
from noauth import NoAuthAuthProvider from noauth import NoAuthAuthProvider
from six import string_types from six import string_types
from six.moves.urllib.parse import quote_plus from six.moves.urllib.parse import quote_plus
from tempest_lib.common.rest_client import RestClient from tempest.lib.common.rest_client import RestClient
from tempest_lib.auth import KeystoneV2Credentials from tempest.lib.auth import KeystoneV2Credentials
from tempest_lib.auth import KeystoneV2AuthProvider from tempest.lib.auth import KeystoneV2AuthProvider
from functionaltests.common.utils import memoized from functionaltests.common.utils import memoized
from functionaltests.common import hooks from functionaltests.common import hooks

2
functionaltests/common/noauth.py
View File

@ -18,7 +18,7 @@ import copy
import re import re
from six.moves.urllib import parse from six.moves.urllib import parse
from tempest_lib.auth import AuthProvider from tempest.lib.auth import AuthProvider
class NoAuthAuthProvider(AuthProvider): class NoAuthAuthProvider(AuthProvider):

4
functionaltests/common/test_meta.py
View File

@ -18,10 +18,10 @@ from functionaltests.api.v2.models.recordset_model import RecordsetModel
from functionaltests.common.models import ZoneFile from functionaltests.common.models import ZoneFile
from functionaltests.common.models import ZoneFileRecord from functionaltests.common.models import ZoneFileRecord
import tempest_lib.base import tempest.lib.base
class MetaTest(tempest_lib.base.BaseTestCase): class MetaTest(tempest.lib.base.BaseTestCase):
def test_zone_file_model_meta_test(self): def test_zone_file_model_meta_test(self):
zone_file = ZoneFile.from_text( zone_file = ZoneFile.from_text(

2
test-requirements.txt
View File

@ -17,7 +17,7 @@ testtools>=1.4.0 # MIT
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
WebTest>=2.0 # MIT WebTest>=2.0 # MIT
tempest-lib>=0.14.0 # Apache-2.0 tempest>=12.1.0 # Apache-2.0
reno>=1.8.0 # Apache2 reno>=1.8.0 # Apache2
# Bandit security code scanner # Bandit security code scanner
bandit>=1.1.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0