openstack/trove
Code Issues Proposed changes

Merge "Update for datastore tests to support multiple datastore types"

Browse Source
This commit is contained in:
Jenkins 2014-01-09 00:53:39 +00:00 committed by Gerrit Code Review
commit 5588e933fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,7 +542,7 @@ class CreateInstance(object):
instance_name = "datastore_version_notfound"
databases = []
users = []
datastore = "Test_Mysql"
datastore = "mysql"
datastore_version = "nonexistent"
try:
assert_raises(exceptions.NotFound,
@ -565,7 +565,7 @@ class CreateInstance(object):
instance_name = "datastore_version_inactive"
databases = []
users = []
datastore = "Test_Mysql"
datastore = "mysql"
datastore_version = "mysql_inactive_version"
try:
assert_raises(exceptions.NotFound,

4
trove/tests/config.py
View File

@ -70,8 +70,8 @@ class TestConfig(object):
'dbaas_url': "http://localhost:8775/v1.0/dbaas",
'version_url': "http://localhost:8775/",
'nova_url': "http://localhost:8774/v1.1",
'dbaas_datastore': "Test_Mysql",
'dbaas_datastore_version': "mysql_test_version",
'dbaas_datastore': "mysql",
'dbaas_datastore_version': "mysql-5.5",
'instance_create_time': 16 * 60,
'mysql_connection_method': {"type": "direct"},
'typical_nova_image_name': None,