Fix tox configuration to validate code coverage correctly

fixes aiiie#8

prysk/cli.py

@@ -8,7 +8,7 @@
 def main():
     try:
         sys.exit(prysk.main(sys.argv[1:]))
-    except (BrokenPipeError, KeyboardInterrupt):
+    except (BrokenPipeError, KeyboardInterrupt):  # pragma: nocover
         pass
 
 

tests/setup.sh

@@ -15,11 +15,10 @@ if [ -n "$COVERAGE" ]; then
   fi
 
   alias prysk="`which "$COVERAGE"` run -a --rcfile=$TESTDIR/../.coveragerc \
-$TESTDIR/../scripts/prysk --shell=$TESTSHELL"
+$TESTDIR/../prysk --shell=$TESTSHELL"
   alias doctest="`which "$COVERAGE"` run -a --rcfile=$TESTDIR/../.coveragerc \
 $TESTDIR/run-doctests.py"
-  alias md5="`which "$COVERAGE"` run -a --rcfile=$TESTDIR/../.coveragerc \
-$TESTDIR/../scripts/md5.py"
+  alias md5="$PYTHON $TESTDIR/../scripts/md5.py"
 else
   PYTHON="`command -v "$PYTHON" || echo "$PYTHON"`"
   alias prysk="$PYTHON -m prysk --shell=$TESTSHELL"

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 #TODO: adjust set of used python interpreter(s)
-envlist=py3-{integration}-{dash,bash,zsh},py3-{coverage}
+envlist=integration-{dash,bash,zsh},coverage
 
 [testenv]
 setenv =
@@ -12,11 +12,19 @@ setenv =
 deps =
     -r{toxinidir}/requirements.txt
 
+[testenv:integration-{dash,bash,zsh}]
 commands =
-    integration:    prysk {env:TESTOPTS:--shell=dash} {toxinidir}/tests
+    prysk {env:TESTOPTS:--shell=bash} {toxinidir}/tests
 
 [testenv:coverage]
 setenv =
     COVERAGE = coverage
+    COVERAGE_FILE={toxinidir}/.coverage
+
 commands =
-    coverage report --fail-under=100
+    coverage run -a --rcfile={toxinidir}/.coveragerc -m prysk.cli {env:TESTOPTS:--shell=bash} {toxinidir}/tests
+    coverage run -a --rcfile={toxinidir}/.coveragerc -m prysk.cli {env:TESTOPTS:--shell=dash} {toxinidir}/tests
+    coverage run -a --rcfile={toxinidir}/.coveragerc -m prysk.cli {env:TESTOPTS:--shell=zsh} {toxinidir}/tests
+    coverage report --fail-under=100
+
+