diff options
| author | Ivan Alejandro <ivanalejandro0@yahoo.com.ar> | 2013-07-05 16:14:46 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@yahoo.com.ar> | 2013-07-05 16:14:46 -0300 |
| commit | 13e8f4f5a1bb915694552b61b69f7cf459bd73b3 (patch) | |
| tree | 51d32ed6a01ae56b7a87abde256961713afb747d | |
| parent | ab7b15eaf576a2a6652ceaa7aecbb567004609fa (diff) | |
| parent | 29053ecc6c3cb7b5b74f7cb7118a7ba7f287e3b1 (diff) | |
Merge remote-tracking branch 'chiiph/bug/add_osx_temp_dir' into develop
| -rw-r--r-- | changes/consider_osx_tempdirs | 1 | ||||
| -rw-r--r-- | src/leap/common/testing/basetest.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/consider_osx_tempdirs b/changes/consider_osx_tempdirs new file mode 100644 index 0000000..5cc20fb --- /dev/null +++ b/changes/consider_osx_tempdirs @@ -0,0 +1 @@ + o Add OSX temp directories to the basetests class.
\ No newline at end of file diff --git a/src/leap/common/testing/basetest.py b/src/leap/common/testing/basetest.py index 8890bf9..54826d5 100644 --- a/src/leap/common/testing/basetest.py +++ b/src/leap/common/testing/basetest.py @@ -68,7 +68,8 @@ class BaseLeapTest(unittest.TestCase): # safety check! please do not wipe my home... # XXX needs to adapt to non-linuces leap_assert( - cls.tempdir.startswith('/tmp/leap_tests-'), + cls.tempdir.startswith('/tmp/leap_tests-') or + cls.tempdir.startswith('/var/folder'), "beware! tried to remove a dir which does not " "live in temporal folder!") shutil.rmtree(cls.tempdir) |