Added docker-compose, system tests and dockerize it

Author: prawn-cake

.coveragerc

@@ -0,0 +1,31 @@
+[run]
+branch = True
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+    def __unicode__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
+
+include =
+    pgclient/*
+omit =
+    pgclient/tests.py
+
+ignore_errors = True
+
+[html]
+directory = coverage_html_report

Makefile

@@ -1,8 +1,11 @@
 # System variables
 ENV_DIR=$(CURDIR)/.env
 PYTHON=$(ENV_DIR)/bin/python
+NOSE=$(ENV_DIR)/bin/nosetests
 COVERAGE=$(ENV_DIR)/bin/coverage
 PROJECT_NAME=pgclient
+CODE_DIR=$(CURDIR)/$(PROJECT_NAME)
+
 
 help:
 # target: help - Display callable targets
@@ -21,16 +24,20 @@ pypi_upload:
 
 .PHONY: test
 test: env
-# target: test - Run tests
-	@$(PYTHON) -m unittest discover
+	@$(NOSE) $(CODE_DIR)/tests.py
+
+.PHONY: system_test
+system_test: env
+# target: test - Run system_test
+	@$(NOSE) system_test.py
 
 
 .PHONY: test_ci
 test_ci: env
 # target: test_ci - Run tests command adapt for CI systems
-	@$(PYTHON) -m unittest discover
+	@$(NOSE) $(CODE_DIR)/tests.py
 
 .PHONY: test_coverage
 # target: test_coverage - Run tests with coverage
 test_coverage: env
-	@$(COVERAGE) run --source=$(PROJECT_NAME) $(PYTHON) -m unittest discover
+	@$(COVERAGE) run --source=$(PROJECT_NAME) $(NOSE) $(CODE_DIR)/tests.py

docker-compose.yml

@@ -0,0 +1,6 @@
+system_test:
+  build: system_test
+  ports:
+    - "5432:5432"
+  environment:
+    POSTGRES_PASSWORD: test

pgclient/queryset.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+
+if __name__ == '__main__':
+    pass

pgclient/system_test/Dockerfile

@@ -0,0 +1,12 @@
+FROM postgresql
+
+# Default user is postgres
+ENV POSTGRES_PASSWORD: test
+
+# This dir is supported by official postgresql image
+ENV PSQL_ENTRYPOINT /docker-entrypoint-initdb.d
+
+MKDIR $PSQL_ENTRYPOINT
+RUN echo "CREATE DATABASE test WITH OWNER postgres;" >> $PSQL_ENTRYPOINT/create_db.sql
+
+#CMD python app.py

pgclient/system_test/system_test.py

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+"""Integration system test for database manager"""
+
+import sys
+import os.path as op
+import psycopg2
+
+sys.path.append(
+    op.abspath(op.dirname(__file__)) + '/../'
+)
+
+import unittest
+from pgclient.client import DatabaseManager
+import random
+
+
+NAMES = ['Alex', 'Andrea', 'Ashley', 'Casey', 'Chris', 'Dorian', 'Jerry']
+
+
+class DatabaseManagerSystemTest(unittest.TestCase):
+    DB_USER = 'postgres'
+    DB_PASSWORD = 'test'
+    DB_NAME = 'test'
+    TABLE_NAME = 'users'
+
+    def setUp(self):
+        dsn = 'user={} password={} dbname={} host=localhost'.format(
+            self.DB_USER, self.DB_PASSWORD, self.DB_NAME)
+        self.db_manager = DatabaseManager(dsn=dsn, pool_size=10)
+
+        try:
+            self._create_table()
+        except psycopg2.DatabaseError:
+            self._drop_table()
+            self._create_table()
+
+        # Insert 100 entries
+        with self.db_manager.cursor as cursor:
+            for _ in range(100):
+                insert_str = "INSERT INTO {} (username) VALUES (%s)".format(
+                    self.TABLE_NAME)
+                cursor.execute(insert_str, (random.choice(NAMES),))
+
+    def _create_table(self):
+        # Init database with test data
+        with self.db_manager.cursor as cursor:
+            cursor.execute(
+                "CREATE TABLE {} "
+                "(id serial PRIMARY KEY, username VARCHAR NOT NULL );".format(
+                    self.TABLE_NAME))
+        print('Table {} has been created'.format(self.TABLE_NAME))
+
+    def _drop_table(self):
+        with self.db_manager.cursor as cursor:
+            cursor.execute('DROP TABLE {}'.format(self.TABLE_NAME))
+        print('Table {} has been dropped'.format(self.TABLE_NAME))
+
+    def tearDown(self):
+        self._drop_table()
+
+    def test_cursor(self):
+        with self.db_manager.cursor as cursor:
+            cursor.execute('SELECT * FROM users')
+            result_set = cursor.fetchall()
+        self.assertEqual(len(result_set), 100)
+
+    def test_dict_cursor(self):
+        with self.db_manager.dict_cursor as cursor:
+            cursor.execute('SELECT * FROM users')
+            result_set = cursor.fetchall()
+        item = result_set[0]
+        self.assertIn('id', item)
+        self.assertIn('username', item)
+        self.assertIn(item['username'], NAMES)
+
+    def test_named_tuple_cursor(self):
+        with self.db_manager.nt_cursor as cursor:
+            cursor.execute('SELECT * FROM users')
+            result_set = cursor.fetchall()
+        item = result_set[0]
+        self.assertIsInstance(item.id, int)
+        self.assertIsInstance(item.username, str)
+
+    def test_success_transaction(self):
+        with self.db_manager.cursor as transaction:
+            insert_str = "INSERT INTO {} (username) VALUES (%s)".format(
+                self.TABLE_NAME)
+            transaction.execute(insert_str, (random.choice(NAMES), ))
+            transaction.execute('SELECT * FROM users')
+            result_set = transaction.fetchall()
+        self.assertEqual(len(result_set), 101)
+
+    def test_rollback_transaction(self):
+        with self.db_manager.cursor as transaction:
+            with self.assertRaises(psycopg2.DatabaseError) as err:
+                transaction.execute(
+                    "INSERT INTO {} (username) VALUES (%s)".format(self.TABLE_NAME),
+                    (None, ))
+            self.assertIn('null value in column', err.exception.message)
+
+
+if __name__ == '__main__':
+    unittest.main()