|
@@ -1,4 +1,4 @@
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -13,9 +13,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
import sys
|
|
@@ -33,7 +33,9 @@ import sqlite3 as sqlite
|
|
|
import pwman.util.config as config
|
|
|
from pwman import default_config
|
|
|
import cPickle
|
|
|
-from test_tools import SetupTester
|
|
|
+from test_tools import SetupTester, DummyCallback4
|
|
|
+import copy
|
|
|
+import unittest
|
|
|
|
|
|
|
|
|
class SQLiteDatabase(Database):
|
|
@@ -303,18 +305,16 @@ class SQLiteDatabase(Database):
|
|
|
else:
|
|
|
return keyrow[0]
|
|
|
|
|
|
-import copy
|
|
|
-
|
|
|
|
|
|
class CreateTestDataBases(object):
|
|
|
|
|
|
def __init__(self):
|
|
|
config.set_defaults(default_config)
|
|
|
enc = CryptoEngine.get(dbver=0.4)
|
|
|
- enc.set_callback(CLICallback())
|
|
|
+ enc.set_callback(DummyCallback4())
|
|
|
self.enc1 = copy.copy(enc)
|
|
|
enc = CryptoEngine.get(dbver=0.5)
|
|
|
- enc.set_callback(CLICallback())
|
|
|
+ enc.set_callback(DummyCallback4())
|
|
|
self.enc2 = copy.copy(enc)
|
|
|
|
|
|
self.db1 = SQLiteDatabaseNewForm('konverter-v0.4.db', dbformat=0.4)
|
|
@@ -362,10 +362,9 @@ class CreateTestDataBases(object):
|
|
|
def run(self):
|
|
|
|
|
|
|
|
|
- import copy
|
|
|
self.db1._open()
|
|
|
enc1 = CryptoEngine.get(dbver=0.4)
|
|
|
- enc1.set_callback(CLICallback())
|
|
|
+ enc1.set_callback(DummyCallback4())
|
|
|
key = self.db1.loadkey()
|
|
|
if key is not None:
|
|
|
enc1.set_cryptedkey(key)
|
|
@@ -380,7 +379,7 @@ class CreateTestDataBases(object):
|
|
|
self.add_nodes_to_db1()
|
|
|
self.db2._open()
|
|
|
enc2 = CryptoEngine.get(dbver=0.5)
|
|
|
- enc2.set_callback(CLICallback())
|
|
|
+ enc2.set_callback(DummyCallback4())
|
|
|
key = self.db2.loadkey()
|
|
|
if key is not None:
|
|
|
enc2.set_cryptedkey(key)
|
|
@@ -397,6 +396,18 @@ class CreateTestDataBases(object):
|
|
|
assert enc1c is not enc2c
|
|
|
|
|
|
|
|
|
+class TestConverter(unittest.TestCase):
|
|
|
+
|
|
|
+ pass
|
|
|
+
|
|
|
if __name__ == '__main__':
|
|
|
tester = CreateTestDataBases()
|
|
|
tester.run()
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|