diff options
| author | Adam Gross <grossag@vmware.com> | 2020-01-10 15:54:24 (GMT) |
|---|---|---|
| committer | Adam Gross <grossag@vmware.com> | 2020-01-10 15:54:24 (GMT) |
| commit | 125a9e0dda8ff8870fc608f1c33661f5d8203fcf (patch) | |
| tree | b807a4add197ba18cf482256d05ef0c152d13a5b /testing | |
| parent | 643bdf9c989713e69b3c34700cbed98e9816f663 (diff) | |
| parent | 9340ef85fea770d01d416ac2dbc2f4991a67e027 (diff) | |
| download | SCons-125a9e0dda8ff8870fc608f1c33661f5d8203fcf.zip SCons-125a9e0dda8ff8870fc608f1c33661f5d8203fcf.tar.gz SCons-125a9e0dda8ff8870fc608f1c33661f5d8203fcf.tar.bz2 | |
Merge branch 'master' into topic/grossag/pythonscanner
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestCmd.py | 1 | ||||
| -rw-r--r-- | testing/framework/TestCmdTests.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py index b98445c..6beed24 100644 --- a/testing/framework/TestCmd.py +++ b/testing/framework/TestCmd.py @@ -310,6 +310,7 @@ import types IS_PY3 = sys.version_info[0] == 3 IS_WINDOWS = sys.platform == 'win32' IS_64_BIT = sys.maxsize > 2**32 +IS_PYPY = hasattr(sys, 'pypy_translation_info') class null(object): pass diff --git a/testing/framework/TestCmdTests.py b/testing/framework/TestCmdTests.py index 0c7b455..48eba1e 100644 --- a/testing/framework/TestCmdTests.py +++ b/testing/framework/TestCmdTests.py @@ -2814,8 +2814,7 @@ class symlink_TestCase(TestCmdTestCase): class tempdir_TestCase(TestCmdTestCase): def setUp(self): TestCmdTestCase.setUp(self) - self._tempdir = tempfile.mktemp() - os.mkdir(self._tempdir) + self._tempdir = tempfile.mkdtemp() os.chdir(self._tempdir) def tearDown(self): |