From 6576b78e24fd430fd92f42e42c6bcdcbb7bf622d Mon Sep 17 00:00:00 2001
From: Henrik tom Woerden <henrik.tom-woerden@ds.mpg.de>
Date: Wed, 24 Jul 2019 12:19:17 +0200
Subject: [PATCH] Reactivate qunit tests
---
.gitlab-ci.yml | 12 ++++++++++--
makefile | 3 ++-
test/docker/Dockerfile | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5dd29a0..b308a021 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,15 @@ stages:
- test
- deploy
-# run qunit tests and pylint
+# run pylint
+test:
+ tags: [ docker ]
+ stage: test
+ script:
+ - make pylint
+ allow_failure: true
+
+# run qunit tests
test:
tags: [ docker ]
stage: test
@@ -51,8 +59,8 @@ test:
- public/qunit.log
- screenlog.*
script:
- - make pylint
- make run-qunit
+ allow_failure: true
# Trigger building of server image and integration tests
trigger_build:
diff --git a/makefile b/makefile
index 0aaadadb..2c2be7e1 100644
--- a/makefile
+++ b/makefile
@@ -73,7 +73,8 @@ run-qunit:
screen -L -S caosdb-webui-test -t server -d -m -A make run-test-server
# start firefox
- screen -S caosdb-webui-test -X screen -t firefox $(XVFB-RUN) firefox "http://localhost:$(PORT)/webinterface/index.html?loggerPort=$(PORT)"
+ screen -S caosdb-webui-test -X screen -t firefox $(XVFB-RUN) firefox \
+ "http://localhost:$(PORT)/webinterface/index.html?loggerPort=$(PORT)"
# wait until server stops
while [ 1 -eq 1 ]; do \
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index 3d053e62..204aa080 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -1,7 +1,7 @@
FROM debian:latest
RUN apt-get update && \
apt-get install firefox-esr pylint3 python3-pip python3-httpbin git \
- curl -y
+ curl screen xvfb unzip -y
RUN git clone -b dev https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \
cd caosdb-pylib && pip3 install .
--
GitLab