From c155dce1b2db1e3d246e918b65659e41f776416a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 4 Sep 2013 14:21:01 -0700 Subject: [PATCH] drop obsolete PYTHONPATH settings These are left over from when we were extracting a tarball in the test dir. Signed-off-by: Sage Weil --- teuthology/task/cram.py | 1 - teuthology/task/restart.py | 1 - teuthology/task/workunit.py | 1 - 3 files changed, 3 deletions(-) diff --git a/teuthology/task/cram.py b/teuthology/task/cram.py index 4829b8edd1..628982d8f6 100644 --- a/teuthology/task/cram.py +++ b/teuthology/task/cram.py @@ -112,7 +112,6 @@ def _run_tests(ctx, role): args=[ run.Raw('CEPH_REF={ref}'.format(ref=ceph_ref)), run.Raw('CEPH_ID="{id}"'.format(id=id_)), - run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)), '{tdir}/adjust-ulimits'.format(tdir=testdir), 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), diff --git a/teuthology/task/restart.py b/teuthology/task/restart.py index c06b76d28c..6d31ee93e3 100644 --- a/teuthology/task/restart.py +++ b/teuthology/task/restart.py @@ -103,7 +103,6 @@ def task(ctx, config): log.info('Running restart script %s...', c) args = [ run.Raw('TESTDIR="{tdir}"'.format(tdir=testdir)), - run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)), ] env = config.get('env') if env is not None: diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py index b8268016dc..ddba6a88be 100644 --- a/teuthology/task/workunit.py +++ b/teuthology/task/workunit.py @@ -280,7 +280,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None): run.Raw('CEPH_REF={ref}'.format(ref=refspec)), run.Raw('TESTDIR="{tdir}"'.format(tdir=testdir)), run.Raw('CEPH_ID="{id}"'.format(id=id_)), - run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)), ] if env is not None: for var, val in env.iteritems(): -- 2.39.5