Simplify temporary HOME dir creation

Author: Flamefire

test/framework/modules.py

@@ -37,7 +37,6 @@
 import stat
 import sys
 from distutils.version import StrictVersion
-from contextlib import contextmanager
 from test.framework.utilities import EnhancedTestCase, TestLoaderFiltered, init_config
 from unittest import TextTestRunner
 
@@ -58,17 +57,6 @@
 TEST_MODULES_COUNT = 81
 
 
-@contextmanager
-def temporary_home_dir():
-    tmpdir = tempfile.mkdtemp()
-    orig_home = os.environ['HOME']
-    os.environ['HOME'] = tmpdir
-    try:
-        yield tmpdir
-    finally:
-        os.environ['HOME'] = orig_home
-        shutil.rmtree(tmpdir)
-
 class ModulesTest(EnhancedTestCase):
     """Test cases for modules."""
 
@@ -375,14 +363,15 @@ def test_exist(self):
             self.init_testmods()
             # Sanity check: Module aliases don't exist yet
             self.assertEqual(self.modtool.exist(['OpenMPI/99', 'OpenMPIAlias']), [False, False])
-            with temporary_home_dir() as home_dir:
-                reset_module_caches()
-                write_file(os.path.join(home_dir, '.modulerc'), '\n'.join([
-                    '#%Module',
-                    'module-version OpenMPI/2.1.2-GCC-6.4.0-2.28 99',
-                    'module-alias OpenMPIAlias OpenMPI/2.1.2-GCC-6.4.0-2.28',
-                ]))
-                self.assertEqual(self.modtool.exist(['OpenMPI/99', 'OpenMPIAlias']), [True, True])
+            # Use a temporary dir, not the users HOME
+            os.environ['HOME'] = tempfile.mkdtemp()
+            reset_module_caches()
+            write_file(os.path.join(os.environ['HOME'], '.modulerc'), '\n'.join([
+                '#%Module',
+                'module-version OpenMPI/2.1.2-GCC-6.4.0-2.28 99',
+                'module-alias OpenMPIAlias OpenMPI/2.1.2-GCC-6.4.0-2.28',
+            ]))
+            self.assertEqual(self.modtool.exist(['OpenMPI/99', 'OpenMPIAlias']), [True, True])
 
     def test_load(self):
         """ test if we load one module it is in the loaded_modules """