Bläddra i källkod

Remove set_callback

oz123 10 år sedan
förälder
incheckning
3d4815ad60
2 ändrade filer med 7 tillägg och 7 borttagningar
  1. 3 3
      pwman/tests/db_tests.py
  2. 4 4
      pwman/tests/test_converter.py

+ 3 - 3
pwman/tests/db_tests.py

@@ -133,17 +133,17 @@ class DBTests(unittest.TestCase):
 
     def test_change_pass(self):
         enc = CryptoEngine.get()
-        enc._callback = DummyCallback2()
+        enc.callback = DummyCallback2()
         self.assertRaises(CryptoBadKeyException,
                           self.tester.cli._db.changepassword)
 
     def test_db_change_pass(self):
         "fuck yeah, we change the password and the new dummy works"
         enc = CryptoEngine.get()
-        enc._callback = DummyCallback3()
+        enc.callback = DummyCallback3()
         self.tester.cli._db.changepassword()
         self.tester.cli.do_forget('')
-        enc._callback = DummyCallback4()
+        enc.callback = DummyCallback4()
         self.tester.cli.do_ls('')
 
     def test_db_list_tags(self):

+ 4 - 4
pwman/tests/test_converter.py

@@ -312,10 +312,10 @@ class CreateTestDataBases(object):
     def __init__(self):
         config.set_defaults(default_config)
         enc = CryptoEngine.get(dbver=0.4)
-        enc.set_callback(DummyCallback4())
+        enc.callback = DummyCallback4()
         self.enc1 = copy.copy(enc)
         enc = CryptoEngine.get(dbver=0.5)
-        enc.set_callback(DummyCallback4())
+        enc.callback = DummyCallback4()
         self.enc2 = copy.copy(enc)
 
         self.db1 = SQLiteDatabaseNewForm('konverter-v0.4.db', dbformat=0.4)
@@ -365,7 +365,7 @@ class CreateTestDataBases(object):
         # this is handeld by the open method
         self.db1._open()
         enc1 = CryptoEngine.get(dbver=0.4)
-        enc1.set_callback(DummyCallback4())
+        enc1.callback = DummyCallback4()
         key = self.db1.loadkey()
         if key is not None:
             enc1.set_cryptedkey(key)
@@ -382,7 +382,7 @@ class CreateTestDataBases(object):
 
         self.db2._open()
         enc2 = CryptoEngine.get(dbver=0.5)
-        enc2.set_callback(DummyCallback4())
+        enc2.callback = DummyCallback4()
         key = self.db2.loadkey()
         if key is not None:
             enc2.set_cryptedkey(key)