testsuite: unlink temporary files

This cleans up the temporary config files created by the option
parsing unit tests. Courtesy Alexander Sulfrian.

2 files changed, 10 insertions, 5 deletions

diff --git a/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py b/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py
index 9f4a7873c..94d30dd3a 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py
@@ -400,9 +400,12 @@ class TestBasicOptions(OptionTestCase):
         fh.write("test")
         fh.close()
 
-        parser.parse(["-C", config_file, "--test", name])
-        self.assertEqual(result.test.name, name)
-        self.assertEqual(result.test.read(), "test")
+        try:
+            parser.parse(["-C", config_file, "--test", name])
+            self.assertEqual(result.test.name, name)
+            self.assertEqual(result.test.read(), "test")
+        finally:
+            os.unlink(name)
 
     @clean_environment
     @make_config()
diff --git a/testsuite/Testsrc/Testlib/TestOptions/__init__.py b/testsuite/Testsrc/Testlib/TestOptions/__init__.py
index ca2c41359..e92f95e94 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/__init__.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/__init__.py
@@ -32,8 +32,10 @@ class make_config(object):  # pylint: disable=invalid-name
             config_file.close()
 
             args = list(args) + [name]
-            rv = func(*args, **kwargs)
-            os.unlink(name)
+            try:
+                rv = func(*args, **kwargs)
+            finally:
+                os.unlink(name)
             return rv
 
         return inner