From a546fdae3007ebf3506ef30d1e479be23ecb3b5a Mon Sep 17 00:00:00 2001
From: Johannes Bechberger <me@mostlynerdless.de>
Date: Mon, 28 Nov 2016 19:36:31 +0100
Subject: [PATCH] Use process local tmp directories

---
 mjtest/environment.py       | 9 +++++++++
 mjtest/test/exec_tests.py   | 4 +---
 mjtest/test/syntax_tests.py | 3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mjtest/environment.py b/mjtest/environment.py
index 4a7c23a..7d5d564 100644
--- a/mjtest/environment.py
+++ b/mjtest/environment.py
@@ -5,6 +5,8 @@ import shutil
 import tempfile
 from datetime import datetime
 import time
+from typing import Dict
+
 from mjtest.util.shell import execute
 from mjtest.util.utils import get_mjtest_basedir, force_colored_output
 import mjtest.util.utils
@@ -94,6 +96,7 @@ class Environment:
         self.ci_testing = ci_testing
         self._tmp_file_ctr = 0
         self._already_preprocessed_files = set()
+        self._pid_tmpdirs = {}  # type: Dict[int, str]
 
     def create_tmpfile(self) -> str:
         self._tmp_file_ctr += 1
@@ -105,6 +108,12 @@ class Environment:
         os.mkdir(dir)
         return dir
 
+    def create_pid_local_tmpdir(self) -> str:
+        pid = os.getpid()
+        if pid not in self._pid_tmpdirs:
+            self._pid_tmpdirs[pid] = self.create_tmpdir()
+        return self._pid_tmpdirs[pid]
+
     def clean_up(self):
         if not self.own_tmp_dir:
             shutil.rmtree(self.tmp_dir)
diff --git a/mjtest/test/exec_tests.py b/mjtest/test/exec_tests.py
index 37c699f..4331330 100644
--- a/mjtest/test/exec_tests.py
+++ b/mjtest/test/exec_tests.py
@@ -35,7 +35,7 @@ class JavaExecTest(BasicSyntaxTest):
 
     def run(self) -> BasicDiffTestResult:
         base_filename = path.basename(self.file).split(".")[0]
-        tmp_dir = self.env.create_tmpdir()
+        tmp_dir = self.env.create_pid_local_tmpdir()
         shutil.copy(self.preprocessed_file, path.join(tmp_dir, base_filename + ".java"))
         cwd = os.getcwd()
         os.chdir(tmp_dir)
@@ -46,7 +46,6 @@ class JavaExecTest(BasicSyntaxTest):
             if javac_rtcode != 0:
                 _LOG.error("File \"{}\" isn't valid Java".format(self.preprocessed_file))
                 os.chdir(cwd)
-                shutil.rmtree(tmp_dir)
                 raise InterruptedError()
             exp_out, _, _ = \
                 self.env.run_command("java", base_filename)
@@ -62,7 +61,6 @@ class JavaExecTest(BasicSyntaxTest):
             out, _, _ = self.env.run_command("./" + base_filename)
             out = out.decode().strip()
             os.chdir(cwd)
-            shutil.rmtree(tmp_dir)
             if self.type == self.MODE and self.env.mode == self.MODE:
                 return BasicDiffTestResult(self, rtcode, out, err.decode(), exp_out)
             return BasicTestResult(self, rtcode, out.decode(), err.decode())
diff --git a/mjtest/test/syntax_tests.py b/mjtest/test/syntax_tests.py
index 46e2ff6..0a426f7 100644
--- a/mjtest/test/syntax_tests.py
+++ b/mjtest/test/syntax_tests.py
@@ -39,11 +39,10 @@ class JavaCompileTest(BasicSyntaxTest):
 
     def __init__(self, env: Environment, type: str, file: str, preprocessed_file: str):
         super().__init__(env, type, file, preprocessed_file)
-        tmp_dir = self.env.create_tmpdir()
+        tmp_dir = self.env.create_pid_local_tmpdir()
         _, self.javac_err, self.javac_rtcode = \
             self.env.run_command("javac", path.relpath(preprocessed_file), "-d", tmp_dir, "-verbose")
         self.javac_err = self.javac_err.decode()  # type: str
-        shutil.rmtree(tmp_dir, ignore_errors=True)
         self._should_succeed = self._is_file_syntactically_correct() if self.SYNTAX_TEST else self.javac_rtcode == 0
 
     def _is_file_syntactically_correct(self):
-- 
2.24.1