diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/merge.sh | 10 | ||||
| -rwxr-xr-x | ci/verify.sh | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ci/merge.sh b/ci/merge.sh index bd1d3fe..337fc55 100755 --- a/ci/merge.sh +++ b/ci/merge.sh @@ -8,4 +8,12 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -PYTHONPATH="`pwd`/storperf":"`pwd`/tests" nosetests --with-xunit . +if [ -x /usr/bin/flake8 ]; then + flake8 storperf +fi + +nosetests --with-xunit \ + --with-coverage \ + --cover-package=storperf\ + --cover-xml \ + storperf diff --git a/ci/verify.sh b/ci/verify.sh index 333a05c..d1b0691 100755 --- a/ci/verify.sh +++ b/ci/verify.sh @@ -8,4 +8,8 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -exit 0 +echo "Verifying code format and compliance..." + +if [ -x /usr/bin/flake8 ] ; then + flake8 storperf +fi |