Forráskód Böngészése

Add test_postgresql to test suite

oz123 10 éve
szülő
commit
e7895aa1ab

+ 1 - 1
.coveragerc

@@ -1,7 +1,7 @@
 [run]
 omit = pwman/tests/*.py, pwman/ui/mac.py, pwman/ui/win.py, \
        pwman/data/convertdb.py, pwman/data/nodes_multiple_approach.py, \
-       pwman/data/models.py, pwman/data/drivers/postgresql.py, \
+       pwman/data/models.py, \
        pwman/data/drivers/mysql.py, pwman/ui/base.py,
        pwman/util/crypto.py 
 source = pwman

+ 6 - 6
pwman/data/drivers/postgresql.py

@@ -45,7 +45,7 @@ class PostgresqlDatabase(Database):
     """
 
     @classmethod
-    def check_db_version(cls, user, dbname='pwman'):
+    def check_db_version(cls, user, dbname='pwman'):  # pragma: no cover
         """
         Check the database version
         """
@@ -95,7 +95,7 @@ class PostgresqlDatabase(Database):
             tid = self._get_or_create_tag(tag)
             self._update_tag_lookup(nodeid, tid)
 
-    def _get_node_tags(self, node):
+    def _get_node_tags(self, node):  # pragma: no cover
         pass
 
     def _update_tag_lookup(self, nodeid, tid):
@@ -109,7 +109,7 @@ class PostgresqlDatabase(Database):
         self._cur.execute(clean)
         self._con.commit()
 
-    def close(self):
+    def close(self):  # pragma: no cover
         self._clean_orphans()
         self._cur.close()
         self._con.close()
@@ -120,7 +120,7 @@ class PostgresqlDatabase(Database):
             self._cur.execute(sql_all)
             ids = self._cur.fetchall()
             return [id[0] for id in ids]
-        else:
+        else:                               # pragma: no cover
             tagid = self._get_tag(filter)
             if not tagid:
                 return []
@@ -131,7 +131,7 @@ class PostgresqlDatabase(Database):
             ids = self._cur.fetchall()
             return [id[0] for id in ids]
 
-    def editnode(self, nid, **kwargs):
+    def editnode(self, nid, **kwargs):  # pragma: no cover
         pass
 
     def add_node(self, node):
@@ -241,5 +241,5 @@ class PostgresqlDatabase(Database):
             self._cur.execute(sql)
             seed, digest = self._cur.fetchone()
             return seed + u'$6$' + digest
-        except TypeError:
+        except TypeError:  # pragma: no cover
             return None

+ 10 - 2
pwman/tests/test_postgresql.py

@@ -23,13 +23,21 @@ from pwman.util.crypto_engine import CryptoEngine
 from .test_crypto_engine import give_key, DummyCallback
 import psycopg2 as pg
 
+##
+# testing on linux host
+# su - postgres
+# psql
+# postgres=# create user $YOUR_USERNAME;
+# postgres=# grant ALL on pwman to $YOUR_USERNAME;
+#
+##
+
 
 class TestPostGresql(unittest.TestCase):
 
     @classmethod
     def setUpClass(self):
-        secret = open('secret.txt').readline().strip()
-        u = "postgresql://oz123:%s@localhost/pwman" % secret
+        u = "postgresql:///pwman"
         self.db = PostgresqlDatabase(u)
         self.db._open()
 

+ 3 - 0
pwman/tests/test_pwman.py

@@ -25,12 +25,14 @@ import unittest
 from .test_crypto_engine import CryptoEngineTest, TestPassGenerator
 from .test_config import TestConfig
 from .test_sqlite import TestSQLite
+from .test_postgresql import TestPostGresql
 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)
 
@@ -52,6 +54,7 @@ def suite():
     suite.addTest(loader.loadTestsFromTestCase(TestPassGenerator))
     suite.addTest(loader.loadTestsFromTestCase(TestConfig))
     suite.addTest(loader.loadTestsFromTestCase(TestSQLite))
+    suite.addTest(loader.loadTestsFromTestCase(TestPostGresql))
     suite.addTest(loader.loadTestsFromTestCase(TestImporter))
     suite.addTest(loader.loadTestsFromTestCase(TestFactory))
     suite.addTest(loader.loadTestsFromTestCase(TestBaseUI))