diff options
| author | adityacp | 2017-04-27 18:37:19 +0530 |
|---|---|---|
| committer | adityacp | 2017-04-27 18:37:19 +0530 |
| commit | 624e752684125aa525d9b3643cbd7c9b7ba61682 (patch) | |
| tree | 726da35ba55acacfde255e31bdc2233600f75395 /.travis.yml | |
| parent | b191455c7d9b0f6c3548da174a68c8ab8052abf0 (diff) | |
| parent | 2694fd6dd4d37a1a6570792e234998feef21edca (diff) | |
| download | online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.tar.gz online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.tar.bz2 online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.zip | |
Remove conflicts from views after rebase
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 4777f11..c242e62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ install: # command to run tests and coverage script: - coverage erase - - coverage run -p manage.py test -v 2 yaksh - - coverage run -p manage.py test -v 2 yaksh.live_server_tests.load_test + - coverage run -p manage.py test -v 2 --settings online_test.test_settings yaksh + - coverage run -p manage.py test -v 2 --settings online_test.test_settings yaksh.live_server_tests.load_test after_success: - coverage combine |