Merge pull request #302 from mitzkia/light-various-fixes

light: Add 3 minor fixes for a: deprecation warning, flaky testcase and crash detection

tests/light/functional_tests/conftest.py

@@ -85,7 +85,7 @@ def setup(request):
     global base_number_of_open_fds
     number_of_open_fds = len(psutil.Process().open_files())
     assert base_number_of_open_fds + 1 == number_of_open_fds, "Previous testcase has unclosed opened fds"
-    assert len(psutil.Process().connections(kind="inet")) == 0, "Previous testcase has unclosed opened sockets"
+    assert len(psutil.Process().net_connections(kind="inet")) == 0, "Previous testcase has unclosed opened sockets"
     testcase_parameters = request.getfixturevalue("testcase_parameters")
 
     copy_file(testcase_parameters.get_testcase_file(), Path.cwd())

tests/light/functional_tests/filterx/test_filterx_update_metric.py

@@ -21,6 +21,7 @@
 # COPYING for details.
 #
 #############################################################################
+from src.common.blocking import wait_until_true
 from src.syslog_ng_config.renderer import render_statement
 from src.syslog_ng_ctl.prometheus_stats_handler import MetricFilter
 
@@ -184,6 +185,7 @@ def test_filterx_update_metric_level(config, port_allocator, syslog_ng):
     network_source.write_log("foo\n")
     file_destination.read_log()
 
+    assert wait_until_true(lambda: config.get_prometheus_samples([MetricFilter("syslogng_metric", {})]) != [])
     samples = config.get_prometheus_samples([MetricFilter("syslogng_metric", {})])
     assert len(samples) == 1
     assert int(samples[0].value) == 1

tests/light/src/syslog_ng/syslog_ng_cli.py

@@ -80,7 +80,6 @@ def is_process_running(self):
     def __wait_for_control_socket_alive(self):
         def is_alive(s):
             if not s.is_process_running():
-                self.__process = None
                 self.__error_handling("syslog-ng is not running")
             return s.__syslog_ng_ctl.is_control_socket_alive()
         return wait_until_true(is_alive, self)
@@ -167,6 +166,10 @@ def __handle_core_file(self):
                 core_file.replace(Path(core_file))
             if core_file_found:
                 raise Exception("syslog-ng core file was found and processed")
+            if self.__process.returncode in [-6, -9, -11]:
+                ret_code = self.__process.returncode
+                self.__process = None
+                raise Exception("syslog-ng process crashed with signal {}".format(ret_code))
 
     def set_start_parameters(self, stderr, debug, trace, verbose, startup_debug, no_caps, config_path, persist_path, pid_path, control_socket_path):
         self.__stderr = stderr