Run tests using a restricted test user instead of admin (#26)

Author: ChintanRaval

.travis.yml

@@ -3,12 +3,11 @@ language: python
 python: 3.7
 env:
   - PIPENV_VERBOSITY=-1
-
-services: docker
+services: postgresql
 before_install:
-  - docker pull postgres
-  - docker run -p 5432:5432 -e POSTGRES_PASSWORD=travisci -d postgres
-
+  - psql -d postgres -U postgres -c "SELECT version() as PostgreSQL_VERSION;"
+  - psql -d postgres -U postgres -a -v ON_ERROR_STOP=1 -f ./tests/integration/setup-part1.sql
+  - psql -d integration_test_db -U postgres -a -v ON_ERROR_STOP=1 -f ./tests/integration/setup-part2.sql
 install: make install_deps
 script:
   - make test_unit

Makefile

@@ -2,7 +2,7 @@
 install_deps:
 	pip install pipenv --upgrade
 	pipenv install --dev
-	alembic -c dpo/alembic.ini -x postgresql+psycopg2://postgres:travisci@localhost:5432/postgres upgrade head
+	alembic -c dpo/alembic.ini -x postgresql+psycopg2://integration_test_user:integration_test_password@localhost:5432/integration_test_db upgrade head
 
 # Run unit tests
 test_unit:
@@ -13,4 +13,4 @@ test_integration:
 	./tests/integration/test_integration.sh
 
 test_downgrade_schema:
-	alembic -c dpo/alembic.ini -x postgresql+psycopg2://postgres:travisci@localhost:5432/postgres downgrade base
+	alembic -c dpo/alembic.ini -x postgresql+psycopg2://integration_test_user:integration_test_password@localhost:5432/integration_test_db downgrade base

README.md

@@ -98,8 +98,6 @@ Once the virtual environment has been activated, please refer to [usage](#Usage)
 
 ## Testing
 
-To run integration tests locally, it is highly recommended that [Docker](https://www.docker.com/) is installed.
-
 ### Unit Tests
 
 To run unit tests, run the following command:
@@ -110,37 +108,18 @@ $ pytest
 
 ### Integration Tests
 
-Before running integration tests, please ensure the following information is configured correctly:
-
-- `tests/integration/test_integration.sh:8`
-
-Please ensure that the database connection string points to a valid PostgreSQL instance with valid parameters.
-
-To run integration tests, run the following command:
-
-```
-$ ./tests/integration/test_integration.sh
-```
-
-#### Docker
-
-If Docker is installed, running tests is as simple as running the following commands:
-
-```
-$ docker pull postgres
-$ docker run --name stubdatabase -p 5432:5432 -e POSTGRES_PASSWORD=travisci -d postgres
-$ make test_integration
-$ docker stop stubdatabase
-$ docker remove stubdatabase
-```
-
-#### Local PostgreSQL
-
-If a local instance of PostgreSQL is installed, run integration tests with the following command:
-
-```
-$ make test_integration
-```
+- Install PostgreSQL 9.6+
+- Execute below scripts to setup test db and user
+  ```
+  ./tests/integration/setup-part1.sql
+  ./tests/integration/setup-part2.sql
+  alembic -c dpo/alembic.ini -x postgresql+psycopg2://integration_test_user:integration_test_password@localhost:5432/integration_test_db upgrade head
+  ```
+- To run integration tests, run either of the following commands:
+  ```
+  $ make test_integration
+  $ ./tests/integration/test_integration.sh
+  ```
 
 #### Notes
 

dpo/alembic/versions/c5c34dd0b8f2_refactor_schema_to_support_steps_and_.py

@@ -79,7 +79,6 @@ def upgrade():
             id, created_on, last_updated_on, status, created_on, last_updated_on, execution_time_ms
         FROM dpo.fe9eed6d812f_execution
         ''')
-    op.execute('CREATE EXTENSION IF NOT EXISTS "uuid-ossp";')
     op.execute(
         '''
         INSERT INTO dpo.execution_step (
@@ -165,7 +164,6 @@ def downgrade():
             execution_id, created_on, updated_on, status, execution_time_ms
         FROM dpo.c5c34dd0b8f2_execution
         ''')
-    op.execute('DROP EXTENSION IF EXISTS "uuid-ossp";')
     op.execute(
         '''
         INSERT INTO dpo.execution_model (

tests/integration/setup-part1.sql

@@ -0,0 +1,2 @@
+-- create db
+CREATE DATABASE integration_test_db;

tests/integration/setup-part2.sql

@@ -0,0 +1,9 @@
+-- create extensions
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+-- create user
+CREATE USER integration_test_user WITH ENCRYPTED PASSWORD 'integration_test_password';
+
+-- setup user
+GRANT CONNECT ON DATABASE integration_test_db TO integration_test_user;
+GRANT CREATE ON DATABASE integration_test_db TO integration_test_user;

tests/integration/test_integration.sh

@@ -5,7 +5,7 @@ set -e
 
 # Bootstrap
 dpo="pipenv run python -m dpo"
-dpo_conn_str="postgresql+psycopg2://postgres:travisci@localhost:5432/postgres"
+dpo_conn_str="postgresql+psycopg2://integration_test_user:integration_test_password@localhost:5432/integration_test_db"
 modelDirectory="./tests/integration/models"
 loadModelDirectory="$modelDirectory/load"
 transformModelDirectory="$modelDirectory/transform"