File tree Expand file tree Collapse file tree 3 files changed +37
-2
lines changed Expand file tree Collapse file tree 3 files changed +37
-2
lines changed Original file line number Diff line number Diff line change @@ -100,6 +100,13 @@ env:
100
100
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.2
101
101
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.3
102
102
103
+ # Browsers:
104
+ - COMPOSE_APP=chrome PYTHON_VERSION=3.5
105
+
106
+ matrix :
107
+ allow_failures :
108
+ - env : COMPOSE_APP=firefox PYTHON_VERSION=3.5
109
+
103
110
before_install :
104
111
- echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | sudo tee -a /etc/default/docker
105
112
- sudo service docker restart
@@ -120,7 +127,7 @@ script:
120
127
fi
121
128
122
129
after_failure :
123
- - docker-compose logs $COMPOSE_APP-db || true
130
+ - docker-compose logs
124
131
125
132
deploy :
126
133
provider : script
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ RUN pip install --upgrade pip
30
30
31
31
COPY --chown=test:test tests/requirements/ /requirements/
32
32
RUN for f in /requirements/*.txt; do pip install -r $f; done && \
33
- pip install flake8 flake8-isort sphinx pyenchant sphinxcontrib-spelling
33
+ pip install flake8 flake8-isort sphinx pyenchant sphinxcontrib-spelling selenium
34
34
35
35
RUN mkdir /tests && chown -R test:test /tests
36
36
USER test:test
Original file line number Diff line number Diff line change @@ -158,5 +158,33 @@ services:
158
158
<< : *base
159
159
entrypoint : flake8
160
160
161
+ # Browser tests
162
+ chrome :
163
+ << : *base
164
+ command : --selenium=chrome --selenium-hub=http://chrome-browser:4444/wd/hub
165
+ environment :
166
+ - WAIT_FOR=chrome-browser:4444
167
+ depends_on :
168
+ - chrome-browser
169
+ chrome-browser :
170
+ image : selenium/standalone-chrome
171
+ volumes :
172
+ - /dev/shm:/dev/shm
173
+
174
+ # Firefox tests fail on master
175
+ firefox :
176
+ << : *base
177
+ command : --selenium=firefox --selenium-hub=http://firefox-browser:4444/wd/hub
178
+ environment :
179
+ - WAIT_FOR=firefox-browser:4444
180
+ depends_on :
181
+ - firefox-browser
182
+ firefox-browser :
183
+ image : selenium/standalone-firefox
184
+ volumes :
185
+ - /dev/shm:/dev/shm
186
+
187
+
161
188
volumes :
162
189
oracle :
190
+
You can’t perform that action at this time.
0 commit comments