From b3bffa15c8f73d23eb624d2e58b9b62e3a3ab323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 7 Apr 2020 14:56:40 +0200
Subject: [PATCH] TST: execute the new tests in ci; do output the test info
---
.gitlab-ci.yml | 4 ++--
tests/test_utils.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94567fb..dce5103 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,8 +51,8 @@ unittests:
- echo 'DATABASE_USER_HOST_LIST="%,"' >> .config
- echo "MYSQL_USER_PASSWORD=$MYSQL_ROOT_PASSWORD" >> .config
- echo "MYSQL_HOST=mariadb" >> .config
- - ./utils/make_db test-connection
- - ./utils/make_db test --fresh
+ - ./utils/make_db restore tests/example.dump.sql
+ - ./tests/test_utils.sh
# Build a docker image in which tests for this repository can run
build-testenv:
diff --git a/tests/test_utils.sh b/tests/test_utils.sh
index 5872e8f..ca2369c 100755
--- a/tests/test_utils.sh
+++ b/tests/test_utils.sh
@@ -71,7 +71,7 @@ BACKUPDIR=$backupdir $UTILSPATH/backup.sh > /dev/null
echo '[Ok]'
# run normal tests
echo -n 'running sql tests... '
-$UTILSPATH/make_db test > /dev/null
+$UTILSPATH/make_db test --fresh
echo '[Ok]'
echo -n 'creating secondary dump... '
--
GitLab