summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaheshgudi2017-03-10 16:14:44 +0530
committermaheshgudi2017-03-11 02:15:55 +0530
commit6961ff1cf46d4b8591a4528a2c3fef156268eec5 (patch)
tree608c6c59e626cef48e0254eda9411da6f970e20e
parent8e2bf890d38d4ab2ac73180ff4982302d9355b75 (diff)
parentce7238aef6d5080d8f7ea79b96c9569bf191f0b8 (diff)
downloadonline_test-6961ff1cf46d4b8591a4528a2c3fef156268eec5.tar.gz
online_test-6961ff1cf46d4b8591a4528a2c3fef156268eec5.tar.bz2
online_test-6961ff1cf46d4b8591a4528a2c3fef156268eec5.zip
Merge branch 'master' of https://github.com/fossee/online_test into fill_in_the_blanks
-rw-r--r--.coveragerc12
-rw-r--r--.travis.yml11
-rw-r--r--requirements/requirements-common.txt1
3 files changed, 21 insertions, 3 deletions
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..4ac9a45
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,12 @@
+[run]
+branch = True
+source = .
+omit =
+ *tests*
+ *migrations*
+
+[report]
+exclude_lines =
+ except ImportError:
+ raise NotImplementedError
+ if __name__ == .__main__.: \ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index f1c4dab..4777f11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,12 @@ install:
- pip install -r requirements/requirements-common.txt
- python setup.py develop
-# command to run tests
+# command to run tests and coverage
script:
- - python manage.py test -v 2 yaksh
- - python manage.py test -v 2 yaksh.live_server_tests.load_test
+ - 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
+
+after_success:
+ - coverage combine
+ - coverage report
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index ad29291..e04c5bd 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -4,3 +4,4 @@ pytz==2016.4
python-social-auth==0.2.19
tornado
selenium==2.53.6
+coverage