More testing fixes

tests/test_complete_ui.py

@@ -37,6 +37,7 @@ class Ferrum(unittest.TestCase):
         os.remove('test-chg_passwd.log')
         os.remove(backup)
 
+    @unittest.skip("obsolete")
     def test_b_run_convert(self):
         "invoke pwman with -k option to convert the old data"
         lfile = 'convert-test.log'
@@ -56,7 +57,7 @@ class Ferrum(unittest.TestCase):
         lfile = 'test-chg_passwd.log'
         logfile = open(lfile, 'wb')
         child = pexpect.spawn(os.path.join(os.path.dirname(__file__),
-                                           '../../scripts/pwman3') +
+                                           '../scripts/pwman3') +
                               ' -d ', logfile=logfile)
         child.sendline('passwd')
         child.expect("Please enter your current password:")

tests/test_pwman.py

@@ -21,7 +21,7 @@
 import os
 import sys
 import unittest
-# from .test_tools import (SetupTester)
+#from .test_tools import (SetupTester)
 from .test_crypto_engine import CryptoEngineTest, TestPassGenerator
 from .test_config import TestConfig
 from .test_sqlite import TestSQLite
@@ -35,10 +35,7 @@ from .test_nodes import TestNode
 
 
 if 'win' not in sys.platform:
-    from .test_complete_ui import (Ferrum, NEW_DB_PATH)
-
-    if os.path.exists(NEW_DB_PATH):
-        os.remove(NEW_DB_PATH)
+    from .test_complete_ui import (Ferrum)
 
 # make sure we use local pwman
 sys.path.insert(0, os.getcwd())