3551: Handle missing GOPATH and multiple-entry GOPATH sensibly.

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 3226a3c639354393343beaf4fa5d68adf45bb17c..92497020ac76ab7a1f4efd162d0737b5753eff43 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -23,7 +23,10 @@ import arvados.config
 SERVICES_SRC_DIR = os.path.join(MY_DIRNAME, '../../../services')
 SERVER_PID_PATH = 'tmp/pids/webrick-test.pid'
 WEBSOCKETS_SERVER_PID_PATH = 'tmp/pids/passenger-test.pid'
-os.environ['PATH'] = os.environ['GOPATH'] + '/bin:' + os.environ['PATH']
+if 'GOPATH' in os.environ:
+    gopaths = os.environ['GOPATH'].split(':')
+    gobins = [os.path.join(path, 'bin') for path in gopaths]
+    os.environ['PATH'] = ':'.join(gobins) + ':' + os.environ['PATH']
 
 logfile = None