From 1b8f641016f1a2080ac1385f27ad038919ed2f83 Mon Sep 17 00:00:00 2001
From: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
Date: Thu, 13 Jun 2019 16:41:00 -0700
Subject: Ensure mock configuration directory is cleaned up on session exit.
 (#11700)

---
 lib/spack/spack/test/conftest.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py
index 0b02d9fe93..8fa5ff0e0e 100644
--- a/lib/spack/spack/test/conftest.py
+++ b/lib/spack/spack/test/conftest.py
@@ -293,7 +293,10 @@ def configuration_dir(tmpdir_factory, linux_os):
     content = ''.join(compilers_yaml.read()).format(linux_os)
     t = tmpdir.join('site', 'compilers.yaml')
     t.write(content)
-    return tmpdir
+    yield tmpdir
+
+    # Once done, cleanup the directory
+    shutil.rmtree(str(tmpdir))
 
 
 @pytest.fixture(scope='module')
-- 
cgit v1.2.3-60-g2f50