openstack/trove
Code Issues Proposed changes

Modifying tests to use the compat client

Browse Source 
Modifies tests so they use the old style client code.
This is still exercising the actual v1.* code, it is
just accessing it via the compat module.

partially implements blueprint cli-compliance-upgrade

Change-Id: I5578525325416a28d7ab772ad0817f49ff6c6611
This commit is contained in:
Michael Basnight
2013-10-09 04:02:12 +00:00
parent 9f55a06e09
commit d16940a1c3
23 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/tests/xml.localhost.test.conf
View File

@@ -1,4 +1,4 @@
{
"include-files": ["localhost.test.conf"],
"trove_client_cls": "troveclient.xml.TroveXmlClient"
"trove_client_cls": "troveclient.compat.xml.TroveXmlClient"
}

2
etc/trove/trove.conf.test
View File

@@ -10,7 +10,7 @@ remote_cinder_client = trove.tests.fakes.nova.fake_create_cinder_client
rpc_backend = trove.common.rpc.impl_fake
# This will remove some of the verbose logging when trying to diagnose tox issues
#default_log_levels=routes.middleware=ERROR,trove.common.auth=WARN
default_log_levels=routes.middleware=ERROR,trove.common.auth=WARN
log_file = rdtest.log

6
trove/tests/api/backups.py
View File

@@ -19,13 +19,13 @@ from proboscis.asserts import assert_raises
from proboscis import test
from proboscis import SkipTest
from proboscis.decorators import time_out
import troveclient
import troveclient.compat
from trove.common.utils import poll_until
from trove.tests.util import test_config
from trove.tests.util import create_dbaas_client
from trove.tests.util.users import Requirements
from trove.tests.config import CONFIG
from troveclient import exceptions
from troveclient.compat import exceptions
from trove.tests.api.instances import WaitForGuestInstallationToFinish
from trove.tests.api.instances import instance_info
from trove.tests.api.instances import assert_unprocessable
@@ -55,7 +55,7 @@ class CreateBackups(object):
resp, body = instance_info.dbaas.client.last_response
assert_equal(resp.status, 400)
if not isinstance(instance_info.dbaas.client,
troveclient.xml.TroveXmlClient):
troveclient.compat.xml.TroveXmlClient):
assert_equal(e.message,
"Validation error: "
"backup['instance'] u'%s' does not match "

2
trove/tests/api/databases.py
View File

@@ -14,7 +14,7 @@
import time
from troveclient import exceptions
from troveclient.compat import exceptions
from proboscis import before_class
from proboscis import test

4
trove/tests/api/flavors.py
View File

@@ -18,8 +18,8 @@ import os
from nose.tools import assert_equal
from nose.tools import assert_false
from nose.tools import assert_true
from troveclient import exceptions
from troveclient.flavors import Flavor
from troveclient.compat import exceptions
from troveclient.v1.flavors import Flavor
from proboscis import before_class
from proboscis import test

4
trove/tests/api/header.py
View File

@@ -3,9 +3,9 @@ from proboscis.asserts import *
from proboscis import SkipTest
from functools import wraps
from troveclient.client import TroveHTTPClient
from troveclient.compat.client import TroveHTTPClient
from trove.tests.api.versions import Versions
from troveclient import exceptions
from troveclient.compat import exceptions
@test(groups=['dbaas.api.headers'])

2
trove/tests/api/instances.py
View File

@@ -37,7 +37,7 @@ from datetime import datetime
from time import sleep
from trove.common import exception as rd_exceptions
from troveclient import exceptions
from troveclient.compat import exceptions
from proboscis.decorators import time_out
from proboscis import before_class

4
trove/tests/api/instances_actions.py
View File

@@ -24,8 +24,8 @@ from proboscis import SkipTest
from trove import tests
from trove.tests.util.check import Checker
from troveclient.exceptions import BadRequest
from troveclient.exceptions import HTTPNotImplemented
from troveclient.compat.exceptions import BadRequest
from troveclient.compat.exceptions import HTTPNotImplemented
from trove.tests.api.instances import GROUP as INSTANCE_GROUP
from trove.tests.api.instances import GROUP_START
from trove.tests.api.instances import instance_info

2
trove/tests/api/instances_delete.py
View File

@@ -5,7 +5,7 @@ from proboscis import test
from proboscis.asserts import *
from proboscis.decorators import time_out
from troveclient import exceptions
from troveclient.compat import exceptions
from trove.tests.util import create_dbaas_client
from trove.common.utils import poll_until
from trove.tests.util import test_config

2
trove/tests/api/instances_mysql_down.py
View File

@@ -25,7 +25,7 @@ from proboscis.asserts import *
import time
from datetime import datetime
from troveclient import exceptions
from troveclient.compat import exceptions
from trove.tests import util
from trove.tests.util import create_client
from trove.common.utils import poll_until

2
trove/tests/api/limits.py
View File

@@ -7,7 +7,7 @@ from proboscis import test
from trove.openstack.common import timeutils
from trove.tests.util import create_dbaas_client
from troveclient import exceptions
from troveclient.compat import exceptions
from datetime import datetime
from trove.tests.util.users import Users
from trove.tests.config import CONFIG

2
trove/tests/api/mgmt/accounts.py
View File

@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from troveclient import exceptions
from troveclient.compat import exceptions
from nose.plugins.skip import SkipTest

2
trove/tests/api/mgmt/admin_required.py
View File

@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from troveclient.exceptions import Unauthorized
from troveclient.compat.exceptions import Unauthorized
from proboscis import before_class
from proboscis import test

2
trove/tests/api/mgmt/instances.py
View File

@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from troveclient import exceptions
from troveclient.compat import exceptions
from proboscis import before_class
from proboscis import test

12
trove/tests/api/mgmt/malformed_json.py
View File

@@ -3,7 +3,7 @@ from proboscis import test, SkipTest
from proboscis.asserts import *
from proboscis import after_class
from proboscis import before_class
import troveclient
import troveclient.compat
from trove.tests.config import CONFIG
from trove.tests.api.instances import instance_info
from trove.tests.api.instances import VOLUME_SUPPORT
@@ -50,7 +50,7 @@ class MalformedJson(object):
"Create instance failed with code %s, exception %s"
% (httpCode, e))
if not isinstance(self.dbaas.client,
troveclient.xml.TroveXmlClient):
troveclient.compat.xml.TroveXmlClient):
databases = "u'foo'"
users = "u'bar'"
assert_equal(e.message,
@@ -73,7 +73,7 @@ class MalformedJson(object):
"Create database failed with code %s, exception %s"
% (httpCode, e))
if not isinstance(self.dbaas.client,
troveclient.xml.TroveXmlClient):
troveclient.compat.xml.TroveXmlClient):
_bad_db_data = "u'{foo}'"
assert_equal(e.message,
"Validation error: "
@@ -177,7 +177,7 @@ class MalformedJson(object):
"Change usr/passwd failed with code %s, exception %s"
% (httpCode, e))
if not isinstance(self.dbaas.client,
troveclient.xml.TroveXmlClient):
troveclient.compat.xml.TroveXmlClient):
password = "u''"
assert_equal(e.message,
"Validation error: "
@@ -248,7 +248,7 @@ class MalformedJson(object):
(httpCode, e))
if not isinstance(self.dbaas.client,
troveclient.xml.TroveXmlClient):
troveclient.compat.xml.TroveXmlClient):
flavorId = [u'?']
assert_equal(e.message,
"Validation error: "
@@ -274,7 +274,7 @@ class MalformedJson(object):
"Create instance failed with code %s, exception %s" %
(httpCode, e))
if not isinstance(self.dbaas.client,
troveclient.xml.TroveXmlClient):
troveclient.compat.xml.TroveXmlClient):
volsize = "u'h3ll0'"
assert_equal(e.message,
"Validation error: "

2
trove/tests/api/mgmt/quotas.py
View File

@@ -10,7 +10,7 @@ from trove.tests.util.users import Requirements
from trove.tests.config import CONFIG
from trove.tests.util.check import AttrCheck
from trove.tests.util.check import TypeCheck
from troveclient import exceptions
from troveclient.compat import exceptions
class QuotasBase(object):

2
trove/tests/api/mgmt/storage.py
View File

@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from troveclient import exceptions
from troveclient.compat import exceptions
from nose.plugins.skip import SkipTest

2
trove/tests/api/root.py
View File

@@ -14,7 +14,7 @@
import time
from troveclient import exceptions
from troveclient.compat import exceptions
from nose.plugins.skip import SkipTest
from proboscis import before_class

2
trove/tests/api/user_access.py
View File

@@ -16,7 +16,7 @@ import time
import re
from random import choice
from troveclient import exceptions
from troveclient.compat import exceptions
from proboscis import after_class
from proboscis import before_class

2
trove/tests/api/users.py
View File

@@ -14,7 +14,7 @@
import time
from troveclient import exceptions
from troveclient.compat import exceptions
from proboscis import after_class
from proboscis import before_class

2
trove/tests/api/versions.py
View File

@@ -17,7 +17,7 @@ from proboscis import test
from proboscis.asserts import assert_equal
from proboscis import SkipTest
from troveclient.exceptions import ClientException
from troveclient.compat.exceptions import ClientException
from trove import tests
from trove.tests.util import test_config
from trove.tests.util import create_dbaas_client

10
trove/tests/util/__init__.py
View File

@@ -41,15 +41,15 @@ except ImportError:
from sqlalchemy import create_engine
from troveclient import exceptions
from troveclient.compat import exceptions
from proboscis.asserts import Check
from proboscis.asserts import fail
from proboscis import SkipTest
from troveclient import Dbaas
from troveclient.client import TroveHTTPClient
from troveclient.compat import Dbaas
from troveclient.compat.client import TroveHTTPClient
from trove import tests
from troveclient.xml import TroveXmlClient
from troveclient.compat.xml import TroveXmlClient
from trove.tests.util import test_config as CONFIG
from trove.tests.util.client import TestClient as TestClient
from trove.tests.util.users import Requirements
@@ -122,7 +122,7 @@ def create_dbaas_client(user):
kwargs['service_url'] += "/" + user.tenant
if auth_strategy == 'fake':
from troveclient import auth
from troveclient.compat import auth
class FakeAuth(auth.Authenticator):

2
trove/tests/util/client.py
View File

@@ -29,7 +29,7 @@
from proboscis.asserts import *
from trove.tests.config import CONFIG
from troveclient.xml import TroveXmlClient
from troveclient.compat.xml import TroveXmlClient
from trove.openstack.common import processutils