Commit c6199a4d authored by Klaus Aehlig's avatar Klaus Aehlig

Adapt relative path expansion in PATH to new environment

The test framework we use sets PYTHONPATH for tests so that
the python module under test is used. Unfortunately, the paths
in PYTHONPATH are relative paths. So we need to expand them for
this test. Here we just update our fragile work around, but the
only way the test is called is, well, in testing, so we can build
it for our test environment.
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent e019c091
......@@ -26,8 +26,9 @@ export PYTHON=${PYTHON:=python}
GNTC=daemons/ganeti-cleaner
CCE=$PWD/tools/check-cert-expired
if [ "x$PYTHONPATH" = "x." ]
then export PYTHONPATH=$PWD
# Expand relative PYTHONPATH passed as passed by the test environment.
if [ "x$PYTHONPATH" = "x.:./test/py" ]
then export PYTHONPATH=$PWD:$PWD/test/py
fi
err() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment