Download as
Browse Code »

Commit 370aa526a162f9f8ac74cec7aa41883ff69b1c6c

Authored by Sergio Oliveira
1 parent 42531387
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Removed dependency of settings.yaml in /etc for tests

Showing 3 changed files with 74 additions and 3 deletions   Show diff stats
@@ -10,9 +10,6 @@ install: @@ -10,9 +10,6 @@ install:
10 - pip install -r requirements_dev.txt 10 - pip install -r requirements_dev.txt
11 - pip install django==${DJANGO_VERSION} 11 - pip install django==${DJANGO_VERSION}
12 - pip install -e . 12 - pip install -e .
13 - - colab-init-config > settings.yaml  
14 - - sudo mkdir -p /etc/colab/  
15 - - sudo cp settings.yaml /etc/colab/  
16 - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres 13 - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
17 14
18 before_script: 15 before_script:
@@ -4,6 +4,7 @@ import os @@ -4,6 +4,7 @@ import os
4 import sys 4 import sys
5 5
6 os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings' 6 os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
  7 +os.environ['COLAB_SETTINGS'] = 'tests/settings.yaml'
7 os.environ['COVERAGE_PROCESS_START'] = '.coveragerc' 8 os.environ['COVERAGE_PROCESS_START'] = '.coveragerc'
8 os.environ['REUSE_DB'] = '0' 9 os.environ['REUSE_DB'] = '0'
9 10
tests/settings.yaml 0 → 100644
  Diff comments   View file @370aa52
@@ -0,0 +1,73 @@ @@ -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 +