Fix Travis tests

wildfish · Sep 16, 2018 · 3f0c527 · 3f0c527
1 parent 6674ca7
commit 3f0c527
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,8 @@ env:
   - TOXENV=py34-django2.0
   - TOXENV=py35-django2.0
   - TOXENV=py36-django2.0
+  - TOXENV=py35-django2.1
+  - TOXENV=py36-django2.1
 matrix:
   include:
   - python: '3.5'

diff --git a/setup.py b/setup.py
@@ -58,11 +58,16 @@ def runtests(args):
             SETTINGS['MIDDLEWARE_CLASSES'] = SETTINGS['MIDDLEWARE']
 
         # Build database settings
-        DATABASE = {
+        MEMORY_DATABASE = {
             'ENGINE': 'django.db.backends.sqlite3',
             'NAME': ':memory:',
         }
-        DATABASE['TEST'] = DATABASE.copy()
+        DATABASE = MEMORY_DATABASE.copy()
+        GDPR_DATABASE = MEMORY_DATABASE.copy()
+
+        DATABASE['TEST'] = MEMORY_DATABASE.copy()
+        GDPR_DATABASE['TEST'] = MEMORY_DATABASE.copy()
+
         engine = os.environ.get('DATABASE_ENGINE')
         if engine:
             if engine == "pgsql":
@@ -72,13 +77,10 @@ def runtests(args):
                 DATABASE['ENGINE'] = 'django.db.backends.mysql'
 
                 # Make sure test DB is going to be UTF8
-                DATABASE_TEST = {
-                    'TEST': {
-                        'CHARSET': 'utf8',
-                        'COLLATION': 'utf8_general_ci',
-                    }
+                DATABASE['TEST'] = {
+                    'CHARSET': 'utf8',
+                    'COLLATION': 'utf8_general_ci',
                 }
-                DATABASE.update(DATABASE_TEST)
 
             else:
                 raise ValueError("Unknown database engine")
@@ -89,7 +91,7 @@ def runtests(args):
                     DATABASE[key] = os.environ['DATABASE_' + key]
         SETTINGS['DATABASES'] = {
             'default': DATABASE,
-            'gdpr_log': DATABASE,
+            'gdpr_log': GDPR_DATABASE,
         }
         SETTINGS['DATABASE_ROUTERS'] = ['gdpr_assist.routers.EventLogRouter']
 

diff --git a/tox.ini b/tox.ini
@@ -36,7 +36,7 @@ deps =
     freezegun
     pillow
     psycopg2>2.4.1
-    #mysqlclient>=1.3.3
+    mysqlclient>=1.3.3
     coverage>=4.0
     coveralls>=1.0