From dfd9abeae03adc107869c67e95ef62d4376316b5 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jenkins/helper/test_config.py b/jenkins/helper/test_config.py index c68c91d8..586ec4f0 100644 --- a/jenkins/helper/test_config.py +++ b/jenkins/helper/test_config.py @@ -67,7 +67,10 @@ def __init__(self, # 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:]) + if type(arangosh_args) not is types.ListType: + self.arangosh_args = json.loads(arangosh_args[1:]) + else: + self.arangosh_args = arangosh_args self.args = copy.deepcopy(cfg.extra_args) for param in args: if param.startswith('$'): From 26ba7405ba608e68d45f947e38adb2ba5a8cbf9d Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 6 Nov 2024 09:43:36 +0100 Subject: [PATCH 2/2] oskar seems to think different --- jenkins/helper/test_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/helper/test_config.py b/jenkins/helper/test_config.py index 586ec4f0..5ecd684a 100644 --- a/jenkins/helper/test_config.py +++ b/jenkins/helper/test_config.py @@ -67,10 +67,10 @@ def __init__(self, # 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 type(arangosh_args) not is types.ListType: - self.arangosh_args = json.loads(arangosh_args[1:]) - else: + if isinstance(arangosh_args, list): self.arangosh_args = arangosh_args + else: + self.arangosh_args = json.loads(arangosh_args[1:]) self.args = copy.deepcopy(cfg.extra_args) for param in args: if param.startswith('$'):