diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-05 03:32:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-05 03:32:58 +0000 |
| commit | 7591a1d8e136cf343b14aa0ef4c957403b5dbe2c (patch) | |
| tree | 8b0780951a34b10b48fdac962c7800772503dc6e | |
| parent | 467cc9bb3557ba24999bbf943076d96bfc6c550c (diff) | |
| parent | 3356d55977a0ff091711dcf368d0cc13ae0567f8 (diff) | |
| download | nova-7591a1d8e136cf343b14aa0ef4c957403b5dbe2c.tar.gz nova-7591a1d8e136cf343b14aa0ef4c957403b5dbe2c.tar.xz nova-7591a1d8e136cf343b14aa0ef4c957403b5dbe2c.zip | |
Merge "Update reset_db to call setup if _DB is None."
| -rw-r--r-- | nova/tests/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index a8d0ef28c..e438e1d64 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -61,6 +61,8 @@ def reset_db(): conn = engine.connect() if _DB: conn.connection.executescript(_DB) + else: + setup() else: shutil.copyfile(os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db), os.path.join(FLAGS.state_path, FLAGS.sqlite_db)) |