diff options
| author | Edmond Kotowski <ekotowski@gmail.com> | 2014-12-02 14:10:49 -0800 |
|---|---|---|
| committer | Edmond Kotowski <ekotowski@gmail.com> | 2014-12-02 17:47:12 -0800 |
| commit | a6358494d1cc17f7b56ff8e515be88e67cd428dc (patch) | |
| tree | bc97acd8bd4133d2f5892f3abcc61a05128cda36 /run_tests.py | |
| parent | 3864816fd6071f54ccbabd3e3837ee147b996161 (diff) | |
| download | trove-a6358494d1cc17f7b56ff8e515be88e67cd428dc.tar.gz | |
Legacy MySQL datastore is shown on datastore-list
On the 019_datastore_fix.py migration script the upgrade method was
calling the has_instances_wo_datastore_version as a function pointer
instead of passing the instance_table in and calling the function. This
meant the if block was always true because it was just checking if the
function exists and the create_legacy_version method was called everytime
causing the "Legacy MySQL" datastore to be inserted even if there was no
legacy trove instances. Now inject the instace_table into the
has_instances_wo_datastore_version and everything works as expected.
Updated the datastore integration tests to not rely on the Legacy MySQL
datastore to exist by using the 10000000-0000-0000-0000-000000000001 GUID.
Instead the test now asserts against the data_store by the name
"Test_Datastore_1" which is the datastore the integration test
intended to validate against.
Closes-Bug: 1396427
Change-Id: Ifff33a962cc8d6ea150f6408d63b81412e196939
Diffstat (limited to 'run_tests.py')
| -rw-r--r-- | run_tests.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py index fc306f41..542144bf 100644 --- a/run_tests.py +++ b/run_tests.py @@ -24,6 +24,7 @@ import sys import traceback from trove.common import cfg +from trove.common import utils from trove.openstack.common import log as logging from trove.tests.config import CONFIG from wsgi_intercept.httplib2_intercept import install as wsgi_install @@ -82,8 +83,8 @@ def datastore_init(): default_version_id= CONFIG.dbaas_datastore_version_id) - models.DBDatastore.create(id=CONFIG.dbaas_datastore_id_no_versions, - name='Test_Datastore_1', + models.DBDatastore.create(id=utils.generate_uuid(), + name=CONFIG.dbaas_datastore_name_no_versions, default_version_id=None) main_dsv = models.DBDatastoreVersion.create( |