From 81527d60d8d307f372743638c08285b4fc418c55 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Mon, 11 Mar 2013 12:27:56 -0400 Subject: [PATCH] Move pep8 and pylint into test suite, so that we can rachet down the number of violations --- jenkins/quality.sh | 16 ---------------- jenkins/test.sh | 5 ++++- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100755 jenkins/quality.sh diff --git a/jenkins/quality.sh b/jenkins/quality.sh deleted file mode 100755 index 56217af874..0000000000 --- a/jenkins/quality.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash - -set -e -set -x - -git remote prune origin - -# Reset the submodule, in case it changed -git submodule foreach 'git reset --hard HEAD' - -# Set the IO encoding to UTF-8 so that askbot will start -export PYTHONIOENCODING=UTF-8 - -rake clobber -rake pep8 || echo "pep8 failed, continuing" -rake pylint || echo "pylint failed, continuing" diff --git a/jenkins/test.sh b/jenkins/test.sh index 5b9a5ed9bd..3a572c9808 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -38,12 +38,15 @@ pip install -q -r test-requirements.txt yes w | pip install -q -r requirements.txt rake clobber +rake pep8 +rake pylint + TESTS_FAILED=0 rake test_cms[false] || TESTS_FAILED=1 rake test_lms[false] || TESTS_FAILED=1 rake test_common/lib/capa || TESTS_FAILED=1 rake test_common/lib/xmodule || TESTS_FAILED=1 -# Don't run the lms jasmine tests for now because +# Don't run the lms jasmine tests for now because # they mostly all fail anyhow # rake phantomjs_jasmine_lms || true rake phantomjs_jasmine_cms || TESTS_FAILED=1