Skip to content

Commit

Permalink
Merge pull request #6 from ymoch/feature/db-testing
Browse files Browse the repository at this point in the history
Testing on DB containers.
  • Loading branch information
ymoch committed Feb 8, 2017
2 parents 48b9147 + 25f228f commit 86a0975
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 4 deletions.
21 changes: 17 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
sudo: required
services:
- docker
language: python
python:
- 2.7
Expand All @@ -10,11 +13,21 @@ install:
script:
# Unit testing.
- coverage run --source=csv2sql setup.py test

# Integrated testing.
- coverage run -a --source=csv2sql -m csv2sql all -r tbl < data/test-input.csv
- coverage run -a --source=csv2sql -m csv2sql schema -r tbl < data/test-input.csv
- coverage run -a --source=csv2sql -m csv2sql data tbl < data/test-input.csv
- coverage run -a --source=csv2sql -m csv2sql pattern
- coverage run
-a --source=csv2sql -m csv2sql all tbl --lines-for-inference 10
< data/test-input.csv
| docker-compose run psql_client
- coverage run
-a --source=csv2sql -m csv2sql pattern > pattern.yml
- coverage run
-a --source=csv2sql -m csv2sql schema -r -p pattern.yml tbl
< data/test-input.csv
| docker-compose run psql_client
- coverage run
-a --source=csv2sql -m csv2sql data tbl < data/test-input.csv
| docker-compose run psql_client
after_success:
- coveralls
notifications:
Expand Down
18 changes: 18 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: '2'

services:
psql_server:
image: "postgres:9.5"
environment:
POSTGRES_USER: docker
POSTGRES_PASSWORD: docker

psql_client:
build:
context: ./dockerfiles/psql_client
depends_on:
- psql_server
environment:
PGHOST: psql_server
PGUSER: docker
PGPASSWORD: docker
8 changes: 8 additions & 0 deletions dockerfiles/psql_client/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM postgres:9.5

RUN apt-get update && apt-get install -y curl
RUN curl -o /usr/local/bin/wait-for-it.sh \
https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh
RUN chmod 755 /usr/local/bin/wait-for-it.sh

ENTRYPOINT ["wait-for-it.sh", "psql_server:5432", "--", "psql", "--set", "ON_ERROR_STOP=on"]

0 comments on commit 86a0975

Please sign in to comment.