Skip to content

Commit

Permalink
fixed tests, updated travis conf
Browse files Browse the repository at this point in the history
  • Loading branch information
ramusus committed Apr 3, 2014
1 parent c8e8179 commit 6669921
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ before_script:
- mysql -e 'create database django;'
- psql -c 'create database django;' -U postgres
install:
- if [[ $DB == mysql ]]; then pip install mysql-python --use-mirrors; fi
- if [[ $DB == postgres ]]; then pip install psycopg2 --use-mirrors; fi
- if [[ $DB == mysql ]]; then pip install mysql-python; fi
- if [[ $DB == postgres ]]; then pip install psycopg2; fi
- DJANGO_VER=$(./travis_django_version.py $DJANGO)
- pip install $DJANGO_VER --use-mirrors
- pip install simplejson --use-mirrors
- pip install factory_boy --use-mirrors
- pip install coveralls --use-mirrors
- pip install mock --use-mirrors
- pip install . --use-mirrors
- pip install $DJANGO_VER
- pip install simplejson
- pip install factory_boy
- pip install coveralls
- pip install mock
- pip install .
script:
- django-admin.py --version
- coverage run --source=vkontakte_polls quicktest.py vkontakte_polls
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Django Vkontakte Polls
'vkontakte_users',
'vkontakte_wall',
'vkontakte_polls',
'm2m_history',
)

# oauth-tokens settings
Expand Down
6 changes: 4 additions & 2 deletions settings_test.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
INSTALLED_APPS = (
'oauth_tokens',
'taggit',
'vkontakte_api',
'vkontakte_places',
'vkontakte_users',
'vkontakte_groups',
'vkontakte_wall',
'oauth_tokens',
'taggit',
'm2m_history',
)

OAUTH_TOKENS_VKONTAKTE_CLIENT_ID = 3430034
Expand Down

0 comments on commit 6669921

Please sign in to comment.