Fix all failing tests with new crypto engine

pwman/tests/test_crypto_engine.py

@@ -48,7 +48,7 @@ class CryptoEngineTest(unittest.TestCase):
     def test5_e_authenticate(self):
         ce = CryptoEngine.get()
         self.assertFalse(ce.authenticate('verywrong'))
-        self.assertTrue(ce.authenticate('verysecretkey'))
+        self.assertTrue(ce.authenticate('12345'))
         ce._timeout = -1
         self.assertTrue(ce._is_authenticated())
 
@@ -74,9 +74,9 @@ class CryptoEngineTest(unittest.TestCase):
     def test_g_encrypt_decrypt_wrong_pass(self):
         ce = CryptoEngine.get()
         ce._cipher = None
-        ce._reader = give_wrong_key
+        ce._getsecret = give_wrong_key
         self.assertRaises(CryptoException, ce.encrypt, "secret")
-        ce._reader = give_key
+        ce._getsecret = lambda x: '12345'
         secret = ce.encrypt("topsecret")
         decrypt = ce.decrypt(secret)
         self.assertEqual(decrypt, "topsecret")

pwman/tests/test_pwman.py

@@ -47,10 +47,10 @@ def suite():
     suite.addTest(loader.loadTestsFromTestCase(DBTests))
     #suite.addTest(loader.loadTestsFromTestCase(CryptoTest))
     suite.addTest(loader.loadTestsFromTestCase(CLITests))
-    #suite.addTest(loader.loadTestsFromTestCase(ConfigTest))
-    #suite.addTest(loader.loadTestsFromTestCase(FactoryTest))
-    #suite.addTest(loader.loadTestsFromTestCase(TestDBFalseConfig))
-    #suite.addTest(loader.loadTestsFromTestCase(CryptoEngineTest))
+    suite.addTest(loader.loadTestsFromTestCase(ConfigTest))
+    suite.addTest(loader.loadTestsFromTestCase(FactoryTest))
+    suite.addTest(loader.loadTestsFromTestCase(TestDBFalseConfig))
+    suite.addTest(loader.loadTestsFromTestCase(CryptoEngineTest))
     #if 'win' not in sys.platform:
     #    suite.addTest(loader.loadTestsFromTestCase(Ferrum))
     return suite