Skip to content

Commit

Permalink
fix functional tests failing against https endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
mostlygeek committed Jun 7, 2016
1 parent daf5cbb commit d5f1757
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ CMD ["server"]
# install / cache dependencies first
COPY requirements.txt /app/requirements.txt

# install depenencies, cleanup and add libstdc++ back in since
# install dependencies, cleanup and add libstdc++ back in since
# we the app needs to link to it
RUN apk add --update build-base && \
RUN apk add --update build-base ca-certificates && \
pip install -r requirements.txt && \
apk del --purge build-base gcc && \
apk add libstdc++
Expand Down
10 changes: 5 additions & 5 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case "$1" in
server)
_SETTINGS_FILE=${SYNC_SETTINGS_FILE:-"/app/example.ini"}

if [ ! -e $_SETTINGS_FILE ]; then
if [ ! -e $_SETTINGS_FILE ]; then
echo "Could not find ini file: $_SETTINGS_FILE"
exit 1
fi
Expand Down Expand Up @@ -42,12 +42,12 @@ case "$1" in
test_functional)
echo "test - functional"
# run functional tests
export MOZSVC_SQLURI=sqlite:///:memory:
export MOZSVC_SQLURI=sqlite:///:memory:
gunicorn --paste ./syncstorage/tests/tests.ini \
--workers 1 \
--worker-class mozsvc.gunicorn_worker.MozSvcGeventWorker &
--worker-class mozsvc.gunicorn_worker.MozSvcGeventWorker &

SERVER_PID=$!
SERVER_PID=$!
sleep 2

$0 test_endpoint http://localhost:5000
Expand All @@ -56,7 +56,7 @@ case "$1" in
;;

test_endpoint)
python syncstorage/tests/functional/test_storage.py $2
exec python syncstorage/tests/functional/test_storage.py $2
;;

*)
Expand Down

0 comments on commit d5f1757

Please sign in to comment.