Get output from run_tests.
Remove output redirection from run_tests. Remove PEP8 from run_tests; it's called from a separate jenkins job. Change-Id: I6476a3031fe7a52ac52bec5d2ce75ced9590ab2a
This commit is contained in:
parent
36c71d1f22
commit
9390937103
13
run_tests.sh
13
run_tests.sh
|
@ -40,7 +40,7 @@ done
|
||||||
function run_tests {
|
function run_tests {
|
||||||
# Just run the test suites in current environment
|
# Just run the test suites in current environment
|
||||||
${wrapper} rm -f ./$PLUGIN_DIR/tests.sqlite
|
${wrapper} rm -f ./$PLUGIN_DIR/tests.sqlite
|
||||||
${wrapper} $NOSETESTS 2> ./$PLUGIN_DIR/run_tests.err.log
|
${wrapper} $NOSETESTS
|
||||||
}
|
}
|
||||||
|
|
||||||
NOSETESTS="python ./$PLUGIN_DIR/run_tests.py $noseargs"
|
NOSETESTS="python ./$PLUGIN_DIR/run_tests.py $noseargs"
|
||||||
|
@ -80,13 +80,4 @@ then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# FIXME(sirp): bzr version-info is not currently pep-8. This was fixed with
|
run_tests
|
||||||
# lp701898 [1], however, until that version of bzr becomes standard, I'm just
|
|
||||||
# excluding the vcsversion.py file
|
|
||||||
#
|
|
||||||
# [1] https://bugs.launchpad.net/bzr/+bug/701898
|
|
||||||
#
|
|
||||||
PEP8_EXCLUDE=vcsversion.py
|
|
||||||
PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-source"
|
|
||||||
PEP8_INCLUDE="bin/* quantum tests tools run_tests.py"
|
|
||||||
run_tests && pep8 $PEP8_OPTIONS $PEP8_INCLUDE || exit 1
|
|
||||||
|
|
Loading…
Reference in New Issue