summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorankitjavalkar2017-04-26 16:29:39 +0530
committerankitjavalkar2017-04-26 17:38:31 +0530
commit53bd7b2a5524ef224b2299c5acf48c6bd8630a7b (patch)
treea5531edf22079068a969b082d80d1cbad30bd337
parent15152554793107fc3bda5f1146b28303ed6e9b51 (diff)
downloadonline_test-53bd7b2a5524ef224b2299c5acf48c6bd8630a7b.tar.gz
online_test-53bd7b2a5524ef224b2299c5acf48c6bd8630a7b.tar.bz2
online_test-53bd7b2a5524ef224b2299c5acf48c6bd8630a7b.zip
Update travis.yml file to use test_settings to run tests
-rw-r--r--.travis.yml4
-rw-r--r--online_test/test_settings.py2
2 files changed, 3 insertions, 3 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
diff --git a/online_test/test_settings.py b/online_test/test_settings.py
index d416c05..53f4901 100644
--- a/online_test/test_settings.py
+++ b/online_test/test_settings.py
@@ -1,4 +1,4 @@
-from settings import *
+from online_test.settings import *
MIGRATION_MODULES = {'yaksh': None} \ No newline at end of file