From b3be39878bd626dfd16b07ea1f2f16a69270083d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?= <benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de> Date: Tue, 6 Dec 2022 23:18:39 +0100 Subject: [PATCH] Adapt CI settings for fixture loading --- .gitlab-ci.yml | 3 ++- AKPlanning/settings_ci.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28c0603b..a1339669 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,4 +24,5 @@ before_script: test: script: - source venv/bin/activate - - python manage.py test --settings AKPlanning.settings_ci --keepdb + - echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql + - python manage.py test --settings AKPlanning.settings_ci diff --git a/AKPlanning/settings_ci.py b/AKPlanning/settings_ci.py index 99aa3a7a..77f75f4e 100644 --- a/AKPlanning/settings_ci.py +++ b/AKPlanning/settings_ci.py @@ -16,10 +16,11 @@ DATABASES = { 'PASSWORD': 'mysql', 'OPTIONS': { 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'", - 'charset': "utf8mb4", }, 'TEST': { - 'NAME': 'test', + 'NAME': 'tests', + 'CHARSET': "utf8mb4", + 'COLLATION': 'utf8mb4_unicode_ci', }, } } -- GitLab