Use dir not prefix for mkdtemp

Author: Flamefire

easybuild/toolchains/mpi/openmpi.py

@@ -81,7 +81,7 @@ def prepare(self, *args, **kwargs):
         ompi_ver = self.get_software_version(self.MPI_MODULE_NAME)[0]
         if LooseVersion(ompi_ver) >= LooseVersion('2.0') and LooseVersion(ompi_ver) < LooseVersion('3.0'):
             if len(self.orig_tmpdir) > 40:
-                tmpdir = tempfile.mkdtemp(prefix='/tmp/')
+                tmpdir = tempfile.mkdtemp(dir='/tmp/')
                 env.setvar('TMPDIR', tmpdir)
                 warn_msg = "Long $TMPDIR path may cause problems with OpenMPI 2.x, using shorter path: %s" % tmpdir
                 self.log.warning(warn_msg)

test/framework/easyconfig.py

@@ -2211,7 +2211,7 @@ def test_dump_extra(self):
             '',
         ])
 
-        handle, testec = tempfile.mkstemp(prefix=self.test_prefix, suffix='.eb')
+        handle, testec = tempfile.mkstemp(suffix='.eb')
         os.close(handle)
 
         ec = EasyConfig(None, rawtxt=rawtxt)
@@ -2274,7 +2274,7 @@ def test_dump_template(self):
             'moduleclass = "tools"',
         ])
 
-        handle, testec = tempfile.mkstemp(prefix=self.test_prefix, suffix='.eb')
+        handle, testec = tempfile.mkstemp(suffix='.eb')
         os.close(handle)
 
         ec = EasyConfig(None, rawtxt=rawtxt)
@@ -2350,7 +2350,7 @@ def test_dump_comments(self):
             "# trailing comment",
         ])
 
-        handle, testec = tempfile.mkstemp(prefix=self.test_prefix, suffix='.eb')
+        handle, testec = tempfile.mkstemp(suffix='.eb')
         os.close(handle)
 
         ec = EasyConfig(None, rawtxt=rawtxt)

test/framework/modules.py

@@ -588,7 +588,7 @@ def broken_prepend_module_path(*args, **kwargs):
 
     def test_prepend_module_path(self):
         """Test prepend_module_path method."""
-        test_path = tempfile.mkdtemp(prefix=self.test_prefix)
+        test_path = tempfile.mkdtemp()
         self.modtool.prepend_module_path(test_path)
         self.assertTrue(os.path.samefile(curr_module_paths()[0], test_path))
 
@@ -611,17 +611,17 @@ def test_prepend_module_path(self):
         self.assertEqual(modulepath, curr_module_paths())
 
         # test prepending with high priority
-        test_path_bis = tempfile.mkdtemp(prefix=self.test_prefix)
-        test_path_tris = tempfile.mkdtemp(prefix=self.test_prefix)
-        self.modtool.prepend_module_path(test_path_bis, priority=10000)
-        self.assertEqual(test_path_bis, curr_module_paths()[0])
+        test_path_0 = tempfile.mkdtemp(suffix='path_0')
+        test_path_1 = tempfile.mkdtemp(suffix='path_1')
+        self.modtool.prepend_module_path(test_path_0, priority=1000)
+        self.assertEqual(test_path_0, curr_module_paths()[0])
 
         # check whether prepend with priority actually works (only for Lmod)
         if isinstance(self.modtool, Lmod):
-            self.modtool.prepend_module_path(test_path_tris)
+            self.modtool.prepend_module_path(test_path_1)
             modulepath = curr_module_paths()
-            self.assertEqual(test_path_bis, modulepath[0])
-            self.assertEqual(test_path_tris, modulepath[1])
+            self.assertEqual(test_path_0, modulepath[0])
+            self.assertEqual(test_path_1, modulepath[1])
 
     def test_ld_library_path(self):
         """Make sure LD_LIBRARY_PATH is what it should be when loaded multiple modules."""

test/framework/toolchain.py

@@ -2376,7 +2376,7 @@ def prep():
         orig_tmpdir = os.environ.get('TMPDIR')
         if len(orig_tmpdir) > 40:
             # we need to make sure we have a short $TMPDIR for this test...
-            orig_tmpdir = tempfile.mkdtemp(prefix='/tmp/')
+            orig_tmpdir = tempfile.mkdtemp(dir='/tmp/')
             mkdir(orig_tmpdir)
             os.environ['TMPDIR'] = orig_tmpdir