backport syntax enhancements (#608)

* backport syntax enhancements

* add missing forwarding of the param

* add missing forwarding of the param

* add missing forwarding of the param

* backport syntax enhancements

Author: dothebart

jenkins/helper/arangosh.py

@@ -25,6 +25,7 @@ def get_environment(self, params):
 
     def run_testing(self,
                     testcase,
+                    arangosh_args,
                     testing_args,
                     timeout,
                     directory,
@@ -54,7 +55,7 @@ def run_testing(self,
             '--javascript.allow-external-process-control', 'true',
             '--javascript.execute', str(testscript),
             ]
-        run_cmd = args +[
+        run_cmd = arangosh_args + args +[
             '--',
             testcase,
             '--testOutput', directory ] + testing_args

jenkins/helper/async_client.py

@@ -601,6 +601,7 @@ def run_monitored(self,
                 timeout_str = "TIMEOUT OCCURED!"
                 print(timeout_str)
                 timeout_str += "\n"
+                params['error'] += timeout_str
             elif rc_exit is None:
                 print_log(f"{identifier} waiting for regular exit", params)
                 rc_exit = process.wait()

jenkins/helper/test_config.py

@@ -16,6 +16,7 @@ def __init__(self,
                  name,
                  suite,
                  args,
+                 arangosh_args,
                  priority,
                  parallelity,
                  flags):
@@ -61,6 +62,11 @@ def __init__(self,
         self.report_file =  self.base_logdir / 'UNITTEST_RESULT.json'
         self.base_testdir = cfg.test_data_dir_x / self.name
 
+        self.arangosh_args = [];
+        # the yaml work around is to have an A prepended. detect and strip out:
+        if arangosh_args is not None and len(arangosh_args) > 0 and arangosh_args != 'A ""':
+            print(arangosh_args)
+            self.arangosh_args = json.loads(arangosh_args[1:])
         self.args = copy.deepcopy(cfg.extra_args)
         for param in args:
             if param.startswith('$'):

jenkins/helper/test_launch_controller.py

@@ -194,13 +194,15 @@ def read_definition_line(line):
     flags = []
     params = {}
     args = []
+    arangosh_args = []
 
     for idx, bit in enumerate(remainder):
         if bit == "--":
             args = remainder[idx + 1:]
             break
-
-        if "=" in bit:
+        if bit.startswith("--"):
+            arangosh_args.append(bit)
+        elif "=" in bit:
             key, value = bit.split("=", maxsplit=1)
             params[key] = value
         else:
@@ -226,6 +228,7 @@ def read_definition_line(line):
         "parallelity": params["parallelity"],
         "flags": flags,
         "args": args,
+        "arangosh_args": arangosh_args,
         "params": params
     }
 

jenkins/helper/testing_runner.py

@@ -88,6 +88,7 @@ def testing_runner(testing_instance, this, arangosh):
                 this.cov_prefix.mkdir(parents=True)
             this.cov_prefix_var = this.cov_prefix / "testingjs"
         ret = arangosh.run_testing(this.suite,
+                                   this.arangosh_args,
                                    this.args,
                                    999999999,
                                    this.base_logdir,
@@ -107,7 +108,7 @@ def testing_runner(testing_instance, this, arangosh):
         this.delta_seconds = this.delta.total_seconds()
         this.crashed = not this.crashed_file.exists() or this.crashed_file.read_text() == "true"
         this.success = this.success and this.success_file.exists() and this.success_file.read_text() == "true"
-        print(f'done with {this.name_enum} -> {this.success}')
+        print(f"done with {this.name_enum} -> {this.success} {ret['rc_exit']}")
         if this.report_file.exists():
             this.structured_results = this.report_file.read_text(encoding="UTF-8", errors='ignore')
         this.summary = ret['error']
@@ -636,6 +637,7 @@ def register_test_func(self, test):
                                [ *args,
                                  '--index', f"{i}",
                                  '--testBuckets', f'{num_buckets}/{i}'],
+                               test['arangosh_args'],
                                test['priority'],
                                parallelity,
                                test['flags']))
@@ -645,6 +647,7 @@ def register_test_func(self, test):
                            name,
                            test["suite"],
                            [ *args],
+                           test['arangosh_args'],
                            test['priority'],
                            parallelity,
                            test['flags']))