moved integration text execution to docker

This commit is contained in:
Danny Coates 2018-05-03 15:00:34 -07:00
parent f36ac24ac5
commit 7d62a23b36
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
6 changed files with 35 additions and 48 deletions

View file

@ -0,0 +1,9 @@
FROM ubuntu:xenial
RUN apt-get update && \
apt-get install -y python-pip python-dev && \
pip install tox
COPY . /integration
WORKDIR /integration
CMD ["tox", "-e", "integration-tests"]

View file

@ -1,4 +0,0 @@
#!/bin/bash
# piping to dev/null for starting the server within the firefox docker image
npm install > "/dev/null" 2>&1
npm start > "/dev/null" 2>&1 &

View file

@ -3,13 +3,11 @@ envlist = integration-tests, flake8
skipsdist = True
[testenv]
recreate=True
skip_install = True
passenv = DISPLAY MOZ_HEADLESS
deps = -rpipenv.txt
commands =
pipenv install --skip-lock
pipenv run pytest -v --verify-base-url -n 2 --driver Firefox --html=send-test.html --self-contained-html {posargs}
pipenv run pytest -v --verify-base-url --driver Remote --capability browserName firefox --host selenium --html=send-test.html --self-contained-html {posargs}
[testenv:flake8]
commands =
@ -20,5 +18,5 @@ commands =
exclude = .eggs,.tox,docs,node_modules
[pytest]
base_url = http://localhost:8080
base_url = http://web:1443
sensitive_url = mozilla\.(com|org)