Commit fd31cbb71b50c34487352429a52d605c4d76c392
1 parent
f2fb9f28
Exists in
master
and in
34 other branches
Fix test environ variables, remove deprecated yaml
-Add YAML envron to ignore the local yaml at /etc/colab if it exists
Showing
2 changed files
with
2 additions
and
74 deletions
Show diff stats
tests/run.py
| ... | ... | @@ -5,7 +5,8 @@ import sys |
| 5 | 5 | |
| 6 | 6 | os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings' |
| 7 | 7 | os.environ['COLAB_SETTINGS'] = 'tests/config_settings.py' |
| 8 | -os.environ['PLUGINS_SETTINGS'] = 'tests/plugins.d' | |
| 8 | +os.environ['COLAB_YAML_SETTINGS'] = 'tests/settings.yaml' | |
| 9 | +os.environ['COLAB_PLUGINS'] = 'tests/plugins.d' | |
| 9 | 10 | os.environ['COVERAGE_PROCESS_START'] = '.coveragerc' |
| 10 | 11 | os.environ['REUSE_DB'] = '0' |
| 11 | 12 | ... | ... |
tests/settings.yaml
| ... | ... | @@ -1,73 +0,0 @@ |
| 1 | - | |
| 2 | - | |
| 3 | -## Set to false in production | |
| 4 | -DEBUG: true | |
| 5 | -TEMPLATE_DEBUG: true | |
| 6 | - | |
| 7 | -## System admins | |
| 8 | -ADMINS: &admin | |
| 9 | - - | |
| 10 | - - John Foo | |
| 11 | - - john@example.com | |
| 12 | - - | |
| 13 | - - Mary Bar | |
| 14 | - - mary@example.com | |
| 15 | - | |
| 16 | -MANAGERS: *admin | |
| 17 | - | |
| 18 | -COLAB_FROM_ADDRESS: '"Colab" <noreply@example.com>' | |
| 19 | -SERVER_EMAIL: '"Colab" <noreply@example.com>' | |
| 20 | - | |
| 21 | -EMAIL_HOST: localhost | |
| 22 | -EMAIL_PORT: 25 | |
| 23 | -EMAIL_SUBJECT_PREFIX: '[colab]' | |
| 24 | - | |
| 25 | -SECRET_KEY: 'hu8-)szdcjjsz%f02gt$5djbluxc$v0a%01l)di6oi)np7%8lu' | |
| 26 | - | |
| 27 | -# Must use it without trailing slash | |
| 28 | -SITE_URL: 'http://localhost:8000' | |
| 29 | -BROWSERID_AUDIENCES: | |
| 30 | - - http://localhost:8000 | |
| 31 | -# - http://example.com | |
| 32 | -# - https://example.org | |
| 33 | -# - http://example.net | |
| 34 | - | |
| 35 | -ALLOWED_HOSTS: | |
| 36 | - - localhost | |
| 37 | -# - example.com | |
| 38 | -# - example.org | |
| 39 | -# - example.net | |
| 40 | - | |
| 41 | -### Uncomment to enable Broswer ID protocol for authentication | |
| 42 | -# BROWSERID_ENABLED: True | |
| 43 | - | |
| 44 | -### Uncomment to enable Converse.js | |
| 45 | -# CONVERSEJS_ENABLED: True | |
| 46 | - | |
| 47 | -### Uncomment to enable auto-registration | |
| 48 | -# CONVERSEJS_AUTO_REGISTER: 'xmpp.example.com' | |
| 49 | - | |
| 50 | -## Database settings | |
| 51 | -DATABASES: | |
| 52 | - default: | |
| 53 | - ENGINE: django.db.backends.postgresql_psycopg2 | |
| 54 | - HOST: localhost | |
| 55 | - NAME: colab | |
| 56 | - USER: colab | |
| 57 | - PASSWORD: colab | |
| 58 | - | |
| 59 | -## Disable indexing | |
| 60 | -ROBOTS_NOINDEX: false | |
| 61 | - | |
| 62 | -### Log errors to Sentry instance | |
| 63 | -# RAVEN_DSN: 'http://public:secret@example.com/1' | |
| 64 | - | |
| 65 | -### Colab proxied apps | |
| 66 | -COLAB_APPS: | |
| 67 | - colab.plugins.gitlab: | |
| 68 | - upstream: 'http://localhost:8090/gitlab/' | |
| 69 | - private_token: '' | |
| 70 | -# colab.plugins.trac: | |
| 71 | -# upstream: 'http://localhost:5000/trac/' | |
| 72 | - | |
| 73 | - |