From 4770f2e3dcd1372aae74d7fb474cd558d488bd0e Mon Sep 17 00:00:00 2001
From: Eivind Jahren <ejah@equinor.com>
Date: Fri, 22 Sep 2023 12:30:53 +0200
Subject: [PATCH] Fix flaky tests related to data_to_json

---
 .../config/test_forward_model_data_to_json.py       | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tests/unit_tests/config/test_forward_model_data_to_json.py b/tests/unit_tests/config/test_forward_model_data_to_json.py
index 60e3fcca8d1..769c751b0e4 100644
--- a/tests/unit_tests/config/test_forward_model_data_to_json.py
+++ b/tests/unit_tests/config/test_forward_model_data_to_json.py
@@ -81,8 +81,6 @@ def joblist():
     return result
 
 
-# Keywords for the ext_job initialization file
-#
 ext_job_keywords = [
     "MAX_RUNNING",
     "STDIN",
@@ -97,9 +95,6 @@ def joblist():
     "MAX_RUNNING_MINUTES",
 ]
 
-#
-# JSON keywords
-#
 json_keywords = [
     "name",
     "executable",
@@ -167,11 +162,7 @@ def _generate_job(
     mode |= stat.S_IXUSR | stat.S_IXGRP
     os.chmod(executable, stat.S_IMODE(mode))
 
-    ext_job = ExtJob.from_config_file(config_file, name)
-    os.unlink(config_file)
-    os.unlink(executable)
-
-    return ext_job
+    return ExtJob.from_config_file(config_file, name)
 
 
 def empty_list_if_none(_list):
@@ -360,6 +351,7 @@ def test_transfer_arg_types():
     ]
 
 
+@pytest.mark.usefixtures("use_tmpdir")
 def test_one_job(joblist):
     for i, job in enumerate(joblist):
         run_id = "test_one_job"
@@ -384,6 +376,7 @@ def run_all(joblist):
     verify_json_dump(joblist, data, range(len(joblist)), run_id)
 
 
+@pytest.mark.usefixtures("use_tmpdir")
 def test_all_jobs(joblist):
     run_all(joblist)