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

Fix tests + docker on Travis

.travis.yml

@@ -18,13 +18,15 @@ before_install:
 
 before_script:
   - 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 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 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:
-  - 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:
   - docker build --tag "${PROD_IMAGE_NAME}" . -f deploy/docker/prod/Dockerfile

atst/app.py

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

config/base.ini

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

config/ci.ini

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