...
 
Commits (5)
......@@ -36,7 +36,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
......@@ -45,8 +53,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:
......
......@@ -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 \
......
......@@ -27,7 +27,7 @@ window.addEventListener('error', (e) => globalError(e.error));
var globalError = function(error) {
console.log(error);
var stack = error.stack;
var message = "Error! Please help to make CaosDB better! Copy this message and send it via email to t.fitschen@indiscale.com.\n\n";
var message = "Error! Please help to make CaosDB better! Copy this message and send it via email to info@indiscale.com.\n\n";
message += error.toString();
if (stack) {
......@@ -111,7 +111,10 @@ this.connection = new function() {
});
} catch (error) {
if (error.status != null) {
throw new Error("POST scripting returned with HTTP status " + error.status + " - " + error.statusText);
throw new Error(
"POST scripting returned with HTTP status " + error.status
+ " - " + error.statusText + "\n"
+ pstring);
} else {
throw error;
}
......
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 .
#!/bin/bash
# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2019 IndiScale GmbH
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# ** end header
# Copy files which are currently edited or debugged to the caosdb server docker container
set -e
# Copy just the publicly accessible files
core_dir="$(dirname $0)/../src/core"
container="compose_caosdb-server_1"
docker_webui_root="/opt/caosdb/git/caosdb-server/caosdb-webui"
docker_dir="${docker_webui_root}/src/core/"
docker cp "${core_dir}/." "$container:$docker_dir"
docker exec -ti -w "$docker_webui_root" "$container" make