Removed dependency of settings.yaml in /etc for tests

Sergio Oliveira
1 parent 42531387
Showing 3 changed files with 74 additions and 3 deletions Show diff stats
.travis.yml
tests/run.py
tests/settings.yaml
@@ -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:
@@ -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'
  
@@ -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" <noreply@example.com>'
+SERVER_EMAIL: '"Colab" <noreply@example.com>'
+
+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/'
+
+
...	...	@@ -10,9 +10,6 @@ install:
10	10	- pip install -r requirements_dev.txt
11	11	- pip install django==${DJANGO_VERSION}
12	12	- pip install -e .
13		- - colab-init-config > settings.yaml
14		- - sudo mkdir -p /etc/colab/
15		- - sudo cp settings.yaml /etc/colab/
16	13	- psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
17	14
18	15	before_script:
...	...
...	...	@@ -4,6 +4,7 @@ import os
4	4	import sys
5	5
6	6	os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
	7	+os.environ['COLAB_SETTINGS'] = 'tests/settings.yaml'
7	8	os.environ['COVERAGE_PROCESS_START'] = '.coveragerc'
8	9	os.environ['REUSE_DB'] = '0'
9	10
...	...
...	...	@@ -0,0 +1,73 @@
	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	+# PROXIED_APPS:
	67	+# gitlab:
	68	+# upstream: 'http://localhost:8090/gitlab/'
	69	+# private_token: ''
	70	+# trac:
	71	+# upstream: 'http://localhost:5000/trac/'
	72	+
	73	+
...	...