浏览代码

[desktop] Simplify creating DESKTOP_DB_TEST_NAME

Erick Tryzelaar 10 年之前
父节点
当前提交
30696844e4
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      desktop/core/src/desktop/settings.py

+ 1 - 3
desktop/core/src/desktop/settings.py

@@ -287,10 +287,8 @@ if os.getenv('DESKTOP_DB_CONFIG'):
     ["ENGINE", "NAME", "TEST_NAME", "USER", "PASSWORD", "HOST", "PORT"],
     conn_string.split(':')))
 else:
-  test_name = os.environ.get('DESKTOP_DB_TEST_NAME')
+  test_name = os.environ.get('DESKTOP_DB_TEST_NAME', get_desktop_root('desktop-test.db'))
   logging.debug("DESKTOP_DB_TEST_NAME SET: %s" % test_name)
-  if test_name is None:
-    test_name = get_desktop_root('desktop-test.db')
 
   default_db = {
     "ENGINE" : desktop.conf.DATABASE.ENGINE.get(),