From 32beb1cc648459a6dc8f11acdc7fab23c968227f Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 5 Nov 2024 20:00:34 +0100 Subject: [PATCH 1/2] oskar seems to think different --- jenkins/helper/test_config.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/jenkins/helper/test_config.py b/jenkins/helper/test_config.py index 5ecd684a..7b873de2 100644 --- a/jenkins/helper/test_config.py +++ b/jenkins/helper/test_config.py @@ -63,14 +63,7 @@ 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) - if isinstance(arangosh_args, list): - self.arangosh_args = arangosh_args - else: - self.arangosh_args = json.loads(arangosh_args[1:]) + self.arangosh_args = arangosh_args self.args = copy.deepcopy(cfg.extra_args) for param in args: if param.startswith('$'): From 507e6501f41122528c69f408cf25812ec3dc1ed0 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 6 Nov 2024 10:22:29 +0100 Subject: [PATCH 2/2] no circleci no json. --- jenkins/helper/test_config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/jenkins/helper/test_config.py b/jenkins/helper/test_config.py index 7b873de2..580bf9cb 100644 --- a/jenkins/helper/test_config.py +++ b/jenkins/helper/test_config.py @@ -2,7 +2,6 @@ """ keep the config for one testsuite to execute """ import copy import os -import json from site_config import IS_WINDOWS, IS_MAC, TEMP TEST_LOG_FILES = []