Feature/align tmp folder to testname (#462)

* split the huge file into its natural modules

* remove unused imports

* calculate nicer temp dir

* try to flatten directories

* remove debug

Author: dothebart

Diff for: jenkins/helper/arangosh.py

@@ -1,5 +1,6 @@
 #!/bin/env python3
 """ launch a testing.js instance with given testsuite and arguments """
+import os
 
 from async_client import (
     ArangoCLIprogressiveTimeoutExecutor,
@@ -15,21 +16,32 @@ class ArangoshExecutor(ArangoCLIprogressiveTimeoutExecutor):
     def __init__(self, site_config, slot_lock):
         self.slot_lock = slot_lock
         self.read_only = False
+        self.temp_dir = ""
         super().__init__(site_config, None)
 
+    def get_environment(self):
+        """ hook to implemnet custom environment variable setters """
+        my_env = os.environ.copy()
+        my_env['TMPDIR'] = str(self.temp_dir)
+        my_env['TEMP'] = str(self.temp_dir)
+        my_env['TMP'] = str(self.temp_dir)
+        return my_env
+
     def run_testing(self,
                     testcase,
                     testing_args,
                     timeout,
                     directory,
                     logfile,
                     identifier,
+                    tempdir,
                     verbose
                     ):
        # pylint: disable=R0913 disable=R0902
         """ testing.js wrapper """
         print('------')
         print(testing_args)
+        self.temp_dir = tempdir
         args = [
             '-c', str(self.cfg.cfgdir / 'arangosh.conf'),
             "--log.foreground-tty", "true",

Diff for: jenkins/helper/async_client.py

@@ -260,7 +260,10 @@ def __init__(self, config, connect_instance, deadline_signal=-1):
             else:
                 self.deadline_signal = signal.SIGINT
 
-
+    def get_environment(self):
+        """ hook to implemnet custom environment variable setters """
+        return os.environ.copy()
+    
     def run_arango_tool_monitored(
             self,
             executeable,
@@ -352,6 +355,7 @@ def run_monitored(self,
             stderr=PIPE,
             close_fds=ON_POSIX,
             cwd=self.cfg.test_data_dir.resolve(),
+            env=self.get_environment()
         ) as process:
             # pylint: disable=consider-using-f-string
             self.pid = process.pid

Diff for: jenkins/helper/test_config.py

@@ -3,7 +3,7 @@
 import copy
 import os
 
-from site_config import IS_WINDOWS, IS_MAC
+from site_config import IS_WINDOWS, IS_MAC, TEMP
 TEST_LOG_FILES = []
 
 class TestConfig():
@@ -40,6 +40,8 @@ def __init__(self,
         if not self.base_logdir.exists():
             self.base_logdir.mkdir()
         self.log_file =  cfg.run_root / f'{self.name}.log'
+
+        self.temp_dir = TEMP / self.name
         # pylint: disable=global-variable-not-assigned
         global TEST_LOG_FILES
         try:

Diff for: jenkins/helper/testing_runner.py

@@ -49,6 +49,7 @@ def testing_runner(testing_instance, this, arangosh):
                                this.base_logdir,
                                this.log_file,
                                this.name_enum,
+                               this.temp_dir,
                                True) #verbose?
     this.success = (
         not ret["progressive_timeout"] or
@@ -86,6 +87,9 @@ def testing_runner(testing_instance, this, arangosh):
             if this.crashed:
                 testing_instance.crashed = True
             testing_instance.success = False
+        temp_dir = TEMP / ("FAIL_" + this.name)
+        this.temp_dir.rename(temp_dir)
+        this.temp_dir = temp_dir
     testing_instance.done_job(this.parallelity)
 
 class TestingRunner():
@@ -435,6 +439,14 @@ def generate_crash_report(self):
     def generate_test_report(self):
         """ regular testresults zip """
         tarfile = get_workspace() / datetime.now(tz=None).strftime(f"testreport-{self.cfg.datetime_format}")
+        print('flattening inner dir structure')
+        for subdir in TEMP.iterdir():
+            for subsubdir in subdir.iterdir():
+                path_segment = subsubdir.parts[len(subsubdir.parts) - 1]
+                if path_segment.startswith('arangosh_'):
+                    for subsubsubdir in subsubdir.iterdir():
+                        shutil.move(str(subsubsubdir), str(subdir))
+                    subsubdir.rmdir()
         print("Creating " + str(tarfile))
         sys.stdout.flush()
         try: