diff --git a/tests/python/lib/engine.py b/tests/python/lib/engine.py index d5586d047b..be9c996087 100644 --- a/tests/python/lib/engine.py +++ b/tests/python/lib/engine.py @@ -115,11 +115,15 @@ def start(self, start_msgs=None): self._stats_receiver.start() cmd = [self._engine_bin] - for option, value in self._options.items(): - if value is not None: - cmd.append(option) - if value is not True: - cmd.append(str(value)) + for option, value_raw in self._options.items(): + if value_raw is not None: + value_list = value_raw + if type(value_raw) is not list: + value_list = [value_raw] + for val in value_list: + cmd.append(option) + if val is not True: + cmd.append(str(val)) if self._binlog_path: cmd.append(self._binlog_path) diff --git a/tests/python/tests/json_logs/test_signals.py b/tests/python/tests/json_logs/test_signals.py index 2ab3081fc0..2e421461d3 100644 --- a/tests/python/tests/json_logs/test_signals.py +++ b/tests/python/tests/json_logs/test_signals.py @@ -90,7 +90,9 @@ def test_master_sigbus(self): def test_master_sigabrt(self): self.kphp_server.send_signal(signal.SIGABRT) - self.kphp_server.restart() + with self.assertRaises(RuntimeError): + self.kphp_server.stop() + self.kphp_server.start() self.kphp_server.assert_json_log( expect=[{ "version": 0, "type": -1, "env": "", "msg": "SIGABRT terminating program",