diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index dbd4330547b6..7fba02a9371e 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -48,6 +48,9 @@ def setup():
 
 FLAGS = flags.FLAGS
 
+ testdb = os.path.join(FLAGS.state_path, FLAGS.sqlite_db)
+ if os.path.exists(testdb):
+ os.unlink(testdb)
 migration.db_sync()
 ctxt = context.get_admin_context()
 network_manager.VlanManager().create_networks(ctxt,
@@ -58,5 +61,6 @@ def setup():
 FLAGS.vlan_start,
 FLAGS.vpn_start,
 )
- shutil.copyfile(os.path.join(FLAGS.state_path, FLAGS.sqlite_db),
- os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db))
+
+ cleandb = os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db)
+ shutil.copyfile(testdb, cleandb)
diff --git a/run_tests.py b/run_tests.py
index bb6f0dd1e20e..5fb5ba32fb26 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -265,10 +265,6 @@ class NovaTestRunner(core.TextTestRunner):
 
 if __name__ == '__main__':
 logging.setup()
- testdb = os.path.join(FLAGS.state_path,
- FLAGS.sqlite_db)
- if os.path.exists(testdb):
- os.unlink(testdb)
 testdir = os.path.abspath(os.path.join("nova","tests"))
 c = config.Config(stream=sys.stdout,
 env=os.environ,
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/nova/commit/19dc13131b7fe512cb7897a888093b5c9a62e69d.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/nova/commit/19dc13131b7fe512cb7897a888093b5c9a62e69d.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>