浏览代码

Fix Makefile and sqlite testing

oz123 10 年之前
父节点
当前提交
a5825ac059
共有 2 个文件被更改,包括 14 次插入4 次删除
  1. 6 4
      Makefile
  2. 8 0
      pwman/tests/test_sqlite.py

+ 6 - 4
Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean-pyc clean-build docs clean test
+.PHONY: clean-pyc clean-build docs clean test coverage coverage-run
 
 help:
 	@echo "clean-build - remove build artifacts"
@@ -35,11 +35,13 @@ test: install
 test-all:
 	tox
 
-coverage:
+coverage-run:
 	coverage run --source pwman setup.py test
 	coverage report -m
-	coverage html
-	#xdg-open htmlcov/index.html
+	@coverage html
+
+coverage: coverage-run
+	@rm test.db
 
 docs:
 	#rm -f docs/manutils.rst

+ 8 - 0
pwman/tests/test_sqlite.py

@@ -31,12 +31,20 @@ class TestSQLite(unittest.TestCase):
         self.db._con.commit()
         # the method _open calls _create_tables
         self.db.save_crypto_info("foo", "bar")
+        self.db._create_tables()
+
+    def test_1a_create_tables(self):
+        self.db._create_tables()
 
     def test_2_crypto_info(self):
+        self.db._create_tables()
         self.db.save_crypto_info("foo", "bar")
         f = self.db.fetch_crypto_info()
         self.assertListEqual([u'foo', u'bar'], list(f))
 
+    def tearDown(self):
+        self.db.close()
+
 if __name__ == '__main__':
     try:
         unittest.main(verbosity=2)