Merge pull request #1237 from dhermes/remove-bash-cover

Removing cover.sh and folding into tox config.
googleapis · Nov 20, 2015 · d57220c · d57220c
2 parents 58197c3 + 40d93bc
commit d57220c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 29 deletions.
diff --git a/scripts/cover.sh b/scripts/cover.sh
diff --git a/tox.ini b/tox.ini
@@ -13,20 +13,29 @@ deps =
     protobuf>=3.0.0a3
 setenv =
     PYTHONPATH = {toxinidir}/_testing
+covercmd =
+    nosetests \
+      --ignore-files=run_system_test\.py \
+      --with-coverage \
+      --cover-package=gcloud \
+      --cover-erase \
+      --cover-tests \
+      --cover-branches \
+      --nocapture
 
 [testenv:cover]
 basepython =
     python2.7
 commands =
-    {toxinidir}/scripts/cover.sh --cover-min-percentage=100
+    {[testenv]covercmd} --cover-min-percentage=100
 deps =
     {[testenv]deps}
     coverage
 
 [testenv:coveralls]
 basepython = {[testenv:cover]basepython}
 commands =
-    {toxinidir}/scripts/cover.sh
+    {[testenv]covercmd}
     coveralls
 deps =
     {[testenv:cover]deps}