Further cleanup of travis build
This commit is contained in:
parent
e3cf866e60
commit
374fed2d63
2 changed files with 20 additions and 22 deletions
|
|
@ -30,14 +30,12 @@ install:
|
||||||
- pip install coveralls
|
- pip install coveralls
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- python -VV
|
|
||||||
- evennia --init testing_mygame
|
- evennia --init testing_mygame
|
||||||
- cp .travis/testing_settings.py testing_mygame/server/conf/settings.py
|
- cp .travis/testing_settings.py testing_mygame/server/conf/settings.py
|
||||||
- cd testing_mygame
|
- cd testing_mygame
|
||||||
- evennia migrate
|
- evennia migrate
|
||||||
|
|
||||||
script:
|
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
|
- coverage run --source=../evennia --omit=*/migrations/*,*/urls.py,*/test*.py,*.sh,*.txt,*.md,*.pyc,*.service ../bin/unix/evennia test evennia
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
|
|
|
||||||
|
|
@ -38,21 +38,22 @@ SERVERNAME = "testing_mygame"
|
||||||
|
|
||||||
# Testing database types
|
# 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.")
|
print("Loading PostGreSQL database backend.")
|
||||||
DATABASES = {
|
DATABASES['default'] = {
|
||||||
'default': {
|
|
||||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||||
'NAME': 'evennia',
|
'NAME': 'evennia',
|
||||||
'USER': 'evennia',
|
'USER': 'evennia',
|
||||||
'PASSWORD': 'password',
|
'PASSWORD': 'password',
|
||||||
'HOST': 'localhost',
|
'HOST': 'localhost',
|
||||||
'PORT': '' # use default
|
'PORT': '' # use default
|
||||||
}}
|
}
|
||||||
elif os.environ.get("TESTING_DB") == "mysql":
|
elif testing_db == "mysql":
|
||||||
print("Loading MySQL database backend.")
|
print("Loading MySQL database backend.")
|
||||||
DATABASES = {
|
DATABASES['default'] = {
|
||||||
'default': {
|
|
||||||
'ENGINE': 'django.db.backends.mysql',
|
'ENGINE': 'django.db.backends.mysql',
|
||||||
'NAME': 'evennia',
|
'NAME': 'evennia',
|
||||||
'USER': 'evennia',
|
'USER': 'evennia',
|
||||||
|
|
@ -60,7 +61,6 @@ elif os.environ.get("TESTING_DB") == "mysql":
|
||||||
'HOST': 'localhost', # or an IP Address that your DB is hosted on
|
'HOST': 'localhost', # or an IP Address that your DB is hosted on
|
||||||
'PORT': '', # use default port
|
'PORT': '', # use default port
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else: # default sqlite3, use default settings
|
else: # default sqlite3, use default settings
|
||||||
print("Loading SQlite3 database backend (default).")
|
print("Loading SQlite3 database backend (default).")
|
||||||
pass
|
pass
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue