diff --git a/.travis.yml b/.travis.yml index 782f8dd..233145c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,6 @@ install: - pip install -r requirements_dev.txt - pip install django==${DJANGO_VERSION} - pip install -e . - - colab-init-config > settings.yaml - - sudo mkdir -p /etc/colab/ - - sudo cp settings.yaml /etc/colab/ - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres before_script: diff --git a/tests/run.py b/tests/run.py index ef2ac6a..b2366bb 100755 --- a/tests/run.py +++ b/tests/run.py @@ -4,6 +4,7 @@ import os import sys os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings' +os.environ['COLAB_SETTINGS'] = 'tests/settings.yaml' os.environ['COVERAGE_PROCESS_START'] = '.coveragerc' os.environ['REUSE_DB'] = '0' diff --git a/tests/settings.yaml b/tests/settings.yaml new file mode 100644 index 0000000..4e2a7a5 --- /dev/null +++ b/tests/settings.yaml @@ -0,0 +1,73 @@ + + +## Set to false in production +DEBUG: true +TEMPLATE_DEBUG: true + +## System admins +ADMINS: &admin + - + - John Foo + - john@example.com + - + - Mary Bar + - mary@example.com + +MANAGERS: *admin + +COLAB_FROM_ADDRESS: '"Colab" ' +SERVER_EMAIL: '"Colab" ' + +EMAIL_HOST: localhost +EMAIL_PORT: 25 +EMAIL_SUBJECT_PREFIX: '[colab]' + +SECRET_KEY: 'hu8-)szdcjjsz%f02gt$5djbluxc$v0a%01l)di6oi)np7%8lu' + +# Must use it without trailing slash +SITE_URL: 'http://localhost:8000' +BROWSERID_AUDIENCES: + - http://localhost:8000 +# - http://example.com +# - https://example.org +# - http://example.net + +ALLOWED_HOSTS: + - localhost +# - example.com +# - example.org +# - example.net + +### Uncomment to enable Broswer ID protocol for authentication +# BROWSERID_ENABLED: True + +### Uncomment to enable Converse.js +# CONVERSEJS_ENABLED: True + +### Uncomment to enable auto-registration +# CONVERSEJS_AUTO_REGISTER: 'xmpp.example.com' + +## Database settings +DATABASES: + default: + ENGINE: django.db.backends.postgresql_psycopg2 + HOST: localhost + NAME: colab + USER: colab + PASSWORD: colab + +## Disable indexing +ROBOTS_NOINDEX: false + +### Log errors to Sentry instance +# RAVEN_DSN: 'http://public:secret@example.com/1' + +### Colab proxied apps +# PROXIED_APPS: +# gitlab: +# upstream: 'http://localhost:8090/gitlab/' +# private_token: '' +# trac: +# upstream: 'http://localhost:5000/trac/' + + -- libgit2 0.21.2