diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-01-12 17:13:05 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-01-21 13:03:44 -0300 |
| commit | 6ef20e16abb80ea0f265a35b7ecdbb38fb29298c (patch) | |
| tree | 75e7096fc1f4b32a1a9c7e22a78b8ac04bc3c44c | |
| parent | 7664fc93ebd5797f16b15d9f6f42acba3fd111dd (diff) | |
Consider different possibilities for tmpdir.
In some systems the used tmp dir is like '/tmp/leap_tests-asdf' and in
others is like '/tmp/username/leap_tests-asdf'.
With this fix we protect the home dir and consider different possible
temp directories.
| -rw-r--r-- | changes/bug_tempdir-alternatives | 1 | ||||
| -rw-r--r-- | src/leap/common/testing/basetest.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug_tempdir-alternatives b/changes/bug_tempdir-alternatives new file mode 100644 index 0000000..579d880 --- /dev/null +++ b/changes/bug_tempdir-alternatives @@ -0,0 +1 @@ +- Consider different possibilities for tmpdir. Related to #6631. diff --git a/src/leap/common/testing/basetest.py b/src/leap/common/testing/basetest.py index 3c6fc29..efaedc3 100644 --- a/src/leap/common/testing/basetest.py +++ b/src/leap/common/testing/basetest.py @@ -77,6 +77,9 @@ class BaseLeapTest(unittest.TestCase): # XXX needs to adapt to non-linuces leap_assert( cls.tempdir.startswith('/tmp/leap_tests-') or + (cls.tempdir.startswith('/tmp/') and + cls.tempdir.startswith(tempfile.gettempdir()) and + 'leap_tests-' in cls.tempdir) or cls.tempdir.startswith('/var/folder'), "beware! tried to remove a dir which does not " "live in temporal folder!") |