From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 12 Jan 2015 20:13:05 +0000 (-0300)
Subject: Consider different possibilities for tmpdir.
X-Git-Tag: 0.3.10~1
X-Git-Url: https://leap.se/git/leap_pycommon.git/commitdiff_plain/6ef20e16abb80ea0f265a35b7ecdbb38fb29298c

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.
---

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!")