From 35f3cb05ac5c3319072b0f7f86b49f244e3cc3e7 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 18 Jul 2014 09:27:54 -0400 Subject: [PATCH] Update Python package test procedure. Refs #3252 simplifies the way we express Python package dependencies. This lets us invoke tests directly from setup.py, so do that. --- jenkins/run-tests.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh index 52fee76fc6..80a551ac80 100755 --- a/jenkins/run-tests.sh +++ b/jenkins/run-tests.sh @@ -103,7 +103,7 @@ fi title "API server tests complete" -# Keep +# Keep title "Starting Keep tests" cd "$WORKSPACE" cd services/keep/src/keep @@ -150,9 +150,8 @@ cd "$WORKSPACE" cd sdk/python VENVDIR=$(mktemp -d) -virtualenv --setuptools --system-site-packages "$VENVDIR" -"$VENVDIR/bin/pip" install -e . -GOPATH="$HOME/gocode" "$VENVDIR/bin/python" -m unittest discover tests +virtualenv --setuptools "$VENVDIR" +GOPATH="$HOME/gocode" "$VENVDIR/bin/python" setup.py test ECODE=$? @@ -175,8 +174,7 @@ cd "$WORKSPACE" cd services/fuse # We reuse $VENVDIR from the Python SDK tests above -"$VENVDIR/bin/pip" install -e . -GOPATH="$HOME/gocode" "$VENVDIR/bin/python" -m unittest discover tests +GOPATH="$HOME/gocode" "$VENVDIR/bin/python" setup.py test ECODE=$? -- 2.30.2