瀏覽代碼

Add testing for nodes

oz123 10 年之前
父節點
當前提交
a8e5675779
共有 2 個文件被更改,包括 3 次插入14 次删除
  1. 1 1
      pwman/data/nodes.py
  2. 2 13
      pwman/tests/test_pwman.py

+ 1 - 1
pwman/data/nodes.py

@@ -118,7 +118,7 @@ class Node(object):
             return [enc.decrypt(tag).decode() for tag in
                     filter(None, self._tags)]
         except Exception:
-            return [tag.decode() for tag in filter(None, self._tags)]
+            return [tag for tag in filter(None, self._tags)]
 
     @tags.setter
     def tags(self, value):

+ 2 - 13
pwman/tests/test_pwman.py

@@ -22,13 +22,6 @@ import os
 import sys
 import unittest
 from .db_tests import (SetupTester)
-                       #, CLITests,
-                       #DBTests,
-                       # ConfigTest,
-                       # TestDBFalseConfig,
-                       #FactoryTest)
-
-#from .crypto_tests import CryptoTest
 from .test_crypto_engine import CryptoEngineTest
 from .test_config import TestConfig
 from .test_sqlite import TestSQLite
@@ -36,6 +29,7 @@ from .test_importer import TestImporter
 from .test_factory import TestFactory
 from .test_base_ui import TestBaseUI
 from .test_init import TestInit
+from .test_nodes import TestNode
 
 if 'win' not in sys.platform:
     from .test_complete_ui import (Ferrum, NEW_DB_PATH)
@@ -54,12 +48,6 @@ SetupTester().clean()
 def suite():
     loader = unittest.TestLoader()
     suite = unittest.TestSuite()
-    #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(TestConfig))
     suite.addTest(loader.loadTestsFromTestCase(TestSQLite))
@@ -67,6 +55,7 @@ def suite():
     suite.addTest(loader.loadTestsFromTestCase(TestFactory))
     suite.addTest(loader.loadTestsFromTestCase(TestBaseUI))
     suite.addTest(loader.loadTestsFromTestCase(TestInit))
+    suite.addTest(loader.loadTestsFromTestCase(TestNode))
     #if 'win' not in sys.platform:
     #    suite.addTest(loader.loadTestsFromTestCase(Ferrum))
     return suite