From 9e4218d02f981977b50ea28e28dfd634d31890e2 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 31 Mar 2021 17:34:12 +1100 Subject: [PATCH] Mysql fixes --- .github/workflows/mysql.yaml | 6 +++--- InvenTree/InvenTree/ci_mysql.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mysql.yaml b/.github/workflows/mysql.yaml index 7de1bcfc59..1ba8f6b24b 100644 --- a/.github/workflows/mysql.yaml +++ b/.github/workflows/mysql.yaml @@ -14,6 +14,9 @@ jobs: image: mysql:5.7 env: MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: inventree_test_db + MYSQL_USER: inventree + MYSQL_PASSWORD: password ports: - 3306 @@ -30,9 +33,6 @@ jobs: pip3 install invoke pip3 install mysqlclient invoke install - - name: Create Database - run: | - mysql -e 'CREATE DATABASE inventree_test_db;' - name: Run Tests run: | cd InvenTree diff --git a/InvenTree/InvenTree/ci_mysql.py b/InvenTree/InvenTree/ci_mysql.py index 18c6f09a16..ca227642e2 100644 --- a/InvenTree/InvenTree/ci_mysql.py +++ b/InvenTree/InvenTree/ci_mysql.py @@ -12,8 +12,8 @@ if 'test' in sys.argv: # Ensure mysql backend is being used 'ENGINE': 'django.db.backends.mysql', 'NAME': 'inventree_test_db', - 'USER': 'travis', - 'PASSWORD': '', + 'USER': 'inventree', + 'PASSWORD': 'password', 'HOST': '127.0.0.1' 'PORT': '3306', }