Feature/python test runner

jenkins/helper/test_launch_controller.py

@@ -75,6 +75,8 @@ def get_workspace():
     return Path.cwd() / 'work'
 
 TEMP = Path("/tmp/")
+if 'TMP' in os.environ:
+    TEMP = Path(os.environ['TMP'])
 if 'TEMP' in os.environ:
     TEMP = Path(os.environ['TEMP'])
 if 'INNERWORKDIR' in os.environ:
@@ -302,9 +304,11 @@ def __init__(self, definition_file):
         self.timeout = 1800
         if 'timeLimit'.upper() in os.environ:
             self.timeout = int(os.environ['timeLimit'.upper()])
+        elif 'timeLimit' in os.environ:
+            self.timeout = int(os.environ['timeLimit'])
         if psutil.cpu_count() <= 8:
-            print("Small machine detected, trippling deadline!")
-            self.timeout *= 3
+            print("Small machine detected, quadrupling deadline!")
+            self.timeout *= 4
         self.deadline = datetime.now() + timedelta(seconds=self.timeout)
         self.hard_deadline = datetime.now() + timedelta(seconds=self.timeout + 660)
         if definition_file.is_file():
@@ -315,7 +319,21 @@ def __init__(self, definition_file):
             for target in ['RelWithdebInfo', 'Debug']:
                 if (bin_dir / target).exists():
                     bin_dir = bin_dir / target
-
+        self.no_threads = psutil.cpu_count()
+        self.available_slots = round(self.no_threads * 2) #logical=False)
+        if IS_WINDOWS:
+            self.max_load = 0.85
+            self.max_load1 = 0.75
+        else:
+            self.max_load = self.no_threads * 0.9
+            self.max_load1 = self.no_threads * 0.9
+        # self.available_slots += (psutil.cpu_count(logical=True) - self.available_slots) / 2
+        print(f"""Machine Info:
+ - {psutil.cpu_count(logical=False)} Cores / {psutil.cpu_count(logical=True)} Threads
+ - {psutil.virtual_memory()} virtual Memory
+ - {self.max_load} / {self.max_load1} configured maximum load 0 / 1
+ - {self.available_slots} test slots
+""")
         self.cfgdir = base_source_dir / 'etc' / 'relative'
         self.bin_dir = bin_dir
         self.base_path = base_source_dir
@@ -396,15 +414,6 @@ def __init__(self, cfg):
         self.cfg = cfg
         self.deadline_reached = False
         self.slot_lock = Lock()
-        self.no_threads = psutil.cpu_count()
-        self.available_slots = round(self.no_threads * 2) #logical=False)
-        if IS_WINDOWS:
-            self.max_load = 0.85
-            self.max_load1 = 0.75
-        else:
-            self.max_load = self.no_threads * 0.9
-            self.max_load1 = self.no_threads * 0.9
-        # self.available_slots += (psutil.cpu_count(logical=True) - self.available_slots) / 2
         self.used_slots = 0
         self.scenarios = []
         self.arangosh = ArangoshExecutor(self.cfg, self.slot_lock)
@@ -429,7 +438,7 @@ def done_job(self, parallelity):
 
     def launch_next(self, offset, counter):
         """ launch one testing job """
-        if self.scenarios[offset].parallelity > (self.available_slots - self.used_slots):
+        if self.scenarios[offset].parallelity > (self.cfg.available_slots - self.used_slots):
             return False
         try:
             sock_count = get_socket_count()
@@ -439,8 +448,8 @@ def launch_next(self, offset, counter):
         except psutil.AccessDenied:
             pass
         load = psutil.getloadavg()
-        if ((load[0] > self.max_load) or
-            (load[1] > self.max_load1)):
+        if ((load[0] > self.cfg.max_load) or
+            (load[1] > self.cfg.max_load1)):
             print(F"Load to high: {str(load)} waiting before spawning more")
             return False
         with self.slot_lock:
@@ -514,6 +523,7 @@ def handle_deadline(self):
 
     def testing_runner(self):
         """ run testing suites """
+        # pylint: disable=too-many-branches
         mem = psutil.virtual_memory()
         os.environ['ARANGODB_OVERRIDE_DETECTED_TOTAL_MEMORY'] = str(int((mem.total * 0.8) / 9))
 
@@ -535,8 +545,8 @@ def testing_runner(self):
             used_slots = 0
             with self.slot_lock:
                 used_slots = self.used_slots
-            if self.available_slots > used_slots and start_offset < len(self.scenarios):
-                print(f"Launching more: {self.available_slots} > {used_slots} {counter}")
+            if self.cfg.available_slots > used_slots and start_offset < len(self.scenarios):
+                print(f"Launching more: {self.cfg.available_slots} > {used_slots} {counter}")
                 sys.stdout.flush()
                 if self.launch_next(start_offset, counter):
                     start_offset += 1
@@ -573,7 +583,9 @@ def generate_report_txt(self):
         for testrun in self.scenarios:
             print(testrun)
             if testrun.crashed or not testrun.success:
-                summary += testrun.summary
+                summary += f"\n=== {testrun.name} ===\n{testrun.summary}"
+            if testrun.finish is None:
+                summary += f"\n=== {testrun.name} ===\nhasn't been launched at all!"
         print(summary)
         (get_workspace() / 'testfailures.txt').write_text(summary)