From 374fed2d639c06b3847c337b35f775cffc30b3b0 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 19 Mar 2019 23:29:57 +0100
Subject: [PATCH] Further cleanup of travis build

---
 .travis.yml                 |  2 --
 .travis/testing_settings.py | 40 ++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08acf9542..1fe4b94a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,14 +30,12 @@ install:
   - pip install coveralls
 
 before_script:
-  - python -VV
   - evennia --init testing_mygame
   - cp .travis/testing_settings.py testing_mygame/server/conf/settings.py
   - cd testing_mygame
   - evennia migrate
 
 script:
-  - head -n 100 server/conf/settings.py
   - coverage run --source=../evennia --omit=*/migrations/*,*/urls.py,*/test*.py,*.sh,*.txt,*.md,*.pyc,*.service ../bin/unix/evennia test evennia
 
 after_success:
diff --git a/.travis/testing_settings.py b/.travis/testing_settings.py
index 542c48a01..62803a64f 100644
--- a/.travis/testing_settings.py
+++ b/.travis/testing_settings.py
@@ -38,28 +38,28 @@ SERVERNAME = "testing_mygame"
 
 # Testing database types
 
-if os.environ.get("TESTING_DB") == "postgresql":
+testing_db = os.environ.get("TESTING_DB", None)
+print("TESTING_DB='{}'".format(testing_db))
+
+if testing_db == "postgresql":
     print("Loading PostGreSQL database backend.")
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.postgresql_psycopg2',
-            'NAME': 'evennia',
-            'USER': 'evennia',
-            'PASSWORD': 'password',
-            'HOST': 'localhost',
-            'PORT': ''    # use default
-        }}
-elif os.environ.get("TESTING_DB") == "mysql":
+    DATABASES['default'] = {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'evennia',
+        'USER': 'evennia',
+        'PASSWORD': 'password',
+        'HOST': 'localhost',
+        'PORT': ''    # use default
+    }
+elif testing_db == "mysql":
     print("Loading MySQL database backend.")
-    DATABASES = {
-       'default': {
-           'ENGINE': 'django.db.backends.mysql',
-           'NAME': 'evennia',
-           'USER': 'evennia',
-           'PASSWORD': 'password',
-           'HOST': 'localhost',  # or an IP Address that your DB is hosted on
-           'PORT': '',  # use default port
-       }
+    DATABASES['default'] = {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'evennia',
+        'USER': 'evennia',
+        'PASSWORD': 'password',
+        'HOST': 'localhost',  # or an IP Address that your DB is hosted on
+        'PORT': '',  # use default port
     }
 else:  # default sqlite3, use default settings
     print("Loading SQlite3 database backend (default).")