pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #127 from dod-ccpo/fix-monolith-tests

Browse Source 
Fix tests + docker on Travis
This commit is contained in:
patricksmithdds 2018-08-06 09:52:53 -04:00 committed by GitHub
commit 5b8eb03f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -18,13 +18,15 @@ before_install:
before_script: before_script:
- docker run -d --name postgres96 postgres:9.6-alpine - docker run -d --name postgres96 postgres:9.6-alpine
- docker run --link postgres96:postgres96 waisbrot/wait - docker run -d --name redis redis:4.0.10-alpine
- docker run --link postgres96:postgres96 --link redis:redis waisbrot/wait
- export postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)" - export postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)"
- export redis_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" redis)"
- docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL - docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL
- docker build --tag "${TESTER_IMAGE_NAME}" --add-host "postgreshost:${postgres_ip}" . -f deploy/docker/tester/Dockerfile - docker build --tag "${TESTER_IMAGE_NAME}" --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" . -f deploy/docker/tester/Dockerfile
script: script:
- docker run --add-host "postgreshost:${postgres_ip}" "${TESTER_IMAGE_NAME}" - docker run --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" "${TESTER_IMAGE_NAME}"
before_deploy: before_deploy:
- docker build --tag "${PROD_IMAGE_NAME}" . -f deploy/docker/prod/Dockerfile - docker build --tag "${PROD_IMAGE_NAME}" . -f deploy/docker/prod/Dockerfile

2
atst/app.py
View File

@ -1,7 +1,7 @@
import os import os
import re import re
from configparser import ConfigParser from configparser import ConfigParser
from flask import Flask, request, g, session from flask import Flask, request, g
from flask_session import Session from flask_session import Session
import redis import redis
from unipath import Path from unipath import Path

2
config/base.ini
View File

@ -16,7 +16,7 @@ PGPORT = 5432
PGUSER = postgres PGUSER = postgres
PGPASSWORD = postgres PGPASSWORD = postgres
PGDATABASE = atat PGDATABASE = atat
SESSION_TYPE = "redis" SESSION_TYPE = redis
SESSION_COOKIE_DOMAIN= "atat.codes" SESSION_COOKIE_DOMAIN= "atat.codes"
SESSION_COOKIE_SECURE = True SESSION_COOKIE_SECURE = True
SESSION_USE_SIGNER = True SESSION_USE_SIGNER = True

1
config/ci.ini
View File

@ -1,3 +1,4 @@
[default] [default]
PGHOST = postgreshost PGHOST = postgreshost
PGDATABASE = atat_test PGDATABASE = atat_test
REDIS_URI = redis://redishost:6379