From fd31cbb71b50c34487352429a52d605c4d76c392 Mon Sep 17 00:00:00 2001 From: Gust Date: Mon, 6 Apr 2015 09:47:15 -0300 Subject: [PATCH] Fix test environ variables, remove deprecated yaml --- tests/run.py | 3 ++- tests/settings.yaml | 73 ------------------------------------------------------------------------- 2 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 tests/settings.yaml diff --git a/tests/run.py b/tests/run.py index f57962e..c88597d 100755 --- a/tests/run.py +++ b/tests/run.py @@ -5,7 +5,8 @@ import sys os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings' os.environ['COLAB_SETTINGS'] = 'tests/config_settings.py' -os.environ['PLUGINS_SETTINGS'] = 'tests/plugins.d' +os.environ['COLAB_YAML_SETTINGS'] = 'tests/settings.yaml' +os.environ['COLAB_PLUGINS'] = 'tests/plugins.d' os.environ['COVERAGE_PROCESS_START'] = '.coveragerc' os.environ['REUSE_DB'] = '0' diff --git a/tests/settings.yaml b/tests/settings.yaml deleted file mode 100644 index 24391a3..0000000 --- a/tests/settings.yaml +++ /dev/null @@ -1,73 +0,0 @@ - - -## 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 -COLAB_APPS: - colab.plugins.gitlab: - upstream: 'http://localhost:8090/gitlab/' - private_token: '' -# colab.plugins.trac: -# upstream: 'http://localhost:5000/trac/' - - -- libgit2 0.21.2