Download as
Browse Code »

Commit 901deaa2f7558ae8b2c8ae09fdaf7062c082954a

Authored by Sergio Oliveira
2 parents c9b39e42 d8b4f829
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

Merge branch 'coveralls'

Showing 7 changed files with 17 additions and 13 deletions   Show diff stats
@@ -7,7 +7,7 @@ env: @@ -7,7 +7,7 @@ env:
7 - DJANGO_VERSION=1.7.3 7 - DJANGO_VERSION=1.7.3
8 8
9 install: 9 install:
10 - - pip install -r requirements_test.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 13 - colab-init-config > settings.yaml
@@ -15,11 +15,11 @@ install: @@ -15,11 +15,11 @@ install:
15 - sudo cp settings.yaml /etc/colab/ 15 - sudo cp settings.yaml /etc/colab/
16 - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres 16 - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
17 17
18 -#before_script:  
19 -# flake8 revproxy 18 +before_script:
  19 + flake8 colab
20 20
21 script: 21 script:
22 ./runtests.py 22 ./runtests.py
23 23
24 -#after_success:  
25 -# coveralls 24 +after_success:
  25 + coveralls
@@ -76,16 +76,15 @@ desired location in environment variable **COLAB_SETTINGS**. @@ -76,16 +76,15 @@ desired location in environment variable **COLAB_SETTINGS**.
76 About test 76 About test
77 ========== 77 ==========
78 78
79 -How to write a tests. 79 +How to write a test
80 -------------------- 80 --------------------
81 Inside of each folder on /vagrant/colab/<folder> you can create a folder called 81 Inside of each folder on /vagrant/colab/<folder> you can create a folder called
82 "tests", and inside of it implements the code for test each file. 82 "tests", and inside of it implements the code for test each file.
83 83
84 -How to run a test  
85 ------------------ 84 +How to run the tests
  85 +--------------------
86 86
87 Follow the steps below: 87 Follow the steps below:
88 88
89 * Go to vagrant/colab/ 89 * Go to vagrant/colab/
90 -* Install the test dependencies with `pip install -r requirements_test.txt`  
91 * run: ./runtests.sh 90 * run: ./runtests.sh
colab/tests/settings.py
  Diff comments   View file @901deaa
1 -from ..settings import * 1 +from ..settings import * # noqa
2 2
3 3
4 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage' 4 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
requirements_dev.txt 0 → 100644
  Diff comments   View file @901deaa
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +Whoosh==2.5.7
  2 +coverage==3.7.1
  3 +coveralls==0.5
  4 +flake8==2.3.0
  5 +-r requirements.txt
requirements_test.txt
View file @c9b39e4
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -Whoosh==2.5.7  
2 -coverage==3.7.1  
setup.cfg 0 → 100644
  Diff comments   View file @901deaa
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +[flake8]
  2 +exclude = **/migrations/*,**/urls.py
vagrant/provision.sh
  Diff comments   View file @901deaa
@@ -24,7 +24,7 @@ for dir in /vagrant/colab /vagrant; do @@ -24,7 +24,7 @@ for dir in /vagrant/colab /vagrant; do
24 break 24 break
25 fi 25 fi
26 done 26 done
27 -pip install -r $basedir/requirements.txt 27 +pip install -r $basedir/requirements_dev.txt
28 pip install -e $basedir 28 pip install -e $basedir
29 29
30 if [ ! -s /etc/colab/settings.yaml ]; then 30 if [ ! -s /etc/colab/settings.yaml ]; then