Procházet zdrojové kódy

Update test db name, so parallel test work

Oz N Tiram před 8 roky
rodič
revize
264dbab8cd
4 změnil soubory, kde provedl 19 přidání a 13 odebrání
  1. 2 1
      tests/db_tests.py
  2. 2 3
      tests/test_base_ui.py
  3. 7 5
      tests/test_factory.py
  4. 8 4
      tests/test_init.py

+ 2 - 1
tests/db_tests.py

@@ -53,7 +53,8 @@ _saveconfig = False
 from .test_tools import (SetupTester)  # DummyCallback2,
                          #  DummyCallback3, DummyCallback4)
 
-testdb = os.path.join(os.path.dirname(__file__), "test.pwman.db")
+db =  ".".join(("pwman","test", sys.version.split(" " ,1)[0], "db"))
+testdb = os.path.abspath(os.path.join(os.path.dirname(__file__), db))
 
 
 class CLITests(unittest.TestCase):

+ 2 - 3
tests/test_base_ui.py

@@ -20,7 +20,6 @@ import os
 import unittest
 from io import StringIO, BytesIO
 
-import sys
 from pwman.util.crypto_engine import CryptoEngine
 from .test_crypto_engine import give_key, DummyCallback
 from pwman.data.database import __DB_FORMAT__
@@ -28,8 +27,8 @@ from .test_tools import (SetupTester)
 from pwman.data import factory
 from pwman.data.nodes import Node
 
-testdb = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                      "test-baseui.pwman.db"))
+db =  ".".join(("test-baseui","pwman", sys.version.split(" " ,1)[0], "db"))
+testdb = os.path.abspath(os.path.join(os.path.dirname(__file__), db))
 
 print(testdb)
 

+ 7 - 5
tests/test_factory.py

@@ -14,13 +14,14 @@
 # along with Pwman3; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # ============================================================================
-# Copyright (C) 2013-2014 Oz Nahum Tiram <nahumoz@gmail.com>
+# Copyright (C) 2013-2017 Oz Nahum Tiram <nahumoz@gmail.com>
 # ============================================================================
 
-import sys
-import unittest
 import os
 import os.path
+import unittest
+import sys
+
 from pwman.data import factory
 from pwman.data.database import DatabaseException
 from pwman.data.drivers.sqlite import SQLite
@@ -28,8 +29,9 @@ from pwman.data.drivers.postgresql import PostgresqlDatabase
 from pwman.data.database import __DB_FORMAT__
 from .test_tools import (SetupTester)
 
-testdb = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                      "test.pwman.db"))
+db =  ".".join(("pwman","test", sys.version.split(" " ,1)[0], "db"))
+testdb = os.path.abspath(os.path.join(os.path.dirname(__file__), db))
+
 _saveconfig = False
 
 

+ 8 - 4
tests/test_init.py

@@ -16,15 +16,19 @@
 # ============================================================================
 # Copyright (C) 2014 Oz Nahum Tiram <nahumoz@gmail.com>
 # ============================================================================
-import unittest
-from collections import namedtuple
 import os
 import os.path
+import unittest
+import sys
+
+from collections import namedtuple
+
 from pwman import set_xsel
 from pwman.data import factory
 from pwman.data.database import __DB_FORMAT__
 from pwman import (get_conf, get_conf_options, get_db_version)
 from .test_tools import SetupTester
+
 dummyfile = """
 [Encryption]
 
@@ -38,8 +42,8 @@ cls_timeout = 5
 [Database]
 """
 
-testdb = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                      "test.pwman.db"))
+db =  ".".join(("pwman","test", sys.version.split(" " ,1)[0], "db"))
+testdb = os.path.abspath(os.path.join(os.path.dirname(__file__), db))
 
 
 class TestFactory(unittest.TestCase):