[ARVADOS-DEV] updated: 960bdb270fb93118e9241ffc28648962f136a37f

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-tests.sh | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

  discards  0a4718105bddddc80089d3426aa3a3ff35e66555 (commit)
       via  960bdb270fb93118e9241ffc28648962f136a37f (commit)
       via  e1fc53f3f8db8a6770dce3f11231191734217211 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (0a4718105bddddc80089d3426aa3a3ff35e66555)
            \
             N -- N -- N (960bdb270fb93118e9241ffc28648962f136a37f)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 960bdb270fb93118e9241ffc28648962f136a37f
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jan 13 16:43:58 2015 -0500

    3021: Do not install *.egg after running tests: "pip install PyYAML" does what we need.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 146e7f1..6f425f8 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -354,16 +354,8 @@ do_test() {
             go test ${testargs[$1]} "git.curoverse.com/arvados.git/$1"
         elif [[ "$2" == "pip" ]]
         then
-           # Other test suites can depend on tests_require
-           # dependencies of this package. For example, keepproxy runs
-           # run_test_server.py, which depends on the yaml package,
-           # which is in sdk/python's tests_require but not
-           # install_requires, and therefore does not get installed by
-           # setuptools until we run "setup.py test" *and* install the
-           # .egg files that setup.py downloads.
            cd "$WORKSPACE/$1" \
-                && python setup.py test ${testargs[$1]} \
-                && (easy_install *.egg || true)
+                && python setup.py test ${testargs[$1]}
         elif [[ "$2" != "" ]]
         then
             "test_$2"
@@ -546,8 +538,6 @@ test_apiserver() {
 }
 do_test services/api apiserver
 
-# We must test sdk/python before testing services/keepproxy, because
-# keepproxy depends on sdk/python's test dependencies.
 for p in "${pythonstuff[@]}"
 do
     do_test "$p" pip

commit e1fc53f3f8db8a6770dce3f11231191734217211
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jan 13 13:08:48 2015 -0500

    3021: Check for errors when installing PyYAML.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 9c86615..146e7f1 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -325,7 +325,7 @@ then
 fi
 
 # Needed for run_test_server.py which is used by certain (non-Python) tests.
-pip install PyYAML
+pip install PyYAML || fatal "pip install PyYAML failed"
 
 checkexit() {
     if [[ "$?" != "0" ]]; then

-----------------------------------------------------------------------


hooks/post-receive
--