summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-08-05 01:24:19 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2015-08-05 01:24:19 +0200
commit11969913e6718cb7c40ed31be3a3c025815f0931 (patch)
treeb72a16bb64ab27d389b14fd57d868068a273676b
parent906b0ce490ec2f23d764f5f0690feffaad4f6d6c (diff)
parenta3bca16a7be0ab6106bb39be71e45e38b9931bf2 (diff)
downloadpsutil-11969913e6718cb7c40ed31be3a3c025815f0931.tar.gz
Merge branch 'master' of github.com:giampaolo/psutil
-rw-r--r--test/test_psutil.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/test_psutil.py b/test/test_psutil.py
index 368212c4..27806f37 100644
--- a/test/test_psutil.py
+++ b/test/test_psutil.py
@@ -1646,11 +1646,15 @@ class TestProcess(unittest.TestCase):
# with funky chars such as spaces and ")", see:
# https://github.com/giampaolo/psutil/issues/628
# funky_path = os.path.join(tempfile.gettempdir(), "foo bar )")
+ if OSX:
+ tmpdir = "/private/tmp"
+ else:
+ tmpdir = "/tmp"
fd, funky_path = tempfile.mkstemp(
- prefix='psutil-', suffix='foo bar )', dir="/tmp")
+ prefix='psutil-', suffix='foo bar )', dir=tmpdir)
os.close(fd)
fd, c_file = tempfile.mkstemp(
- prefix='psutil-', suffix='.c', dir="/tmp")
+ prefix='psutil-', suffix='.c', dir=tmpdir)
os.close(fd)
self.addCleanup(safe_remove, c_file)
self.addCleanup(safe_remove, funky_path)