test: use a random port for rsyslogd

Author: hnousiainen

systest/test_rsyslog.py

@@ -36,17 +36,14 @@
 
 
 class _TestRsyslogd:
-    def __init__(self, *, workdir, logfile, port):
+    def __init__(self, *, config_file, port):
         if not os.path.exists(RSYSLOGD):
             raise RuntimeError('"{}" not available'.format(RSYSLOGD))
 
+        self.conffile = config_file
         self.port = port
-        self.conffile = "{}/rsyslogd.conf".format(workdir)
         self.process = None
 
-        with open(self.conffile, "w") as fp:
-            print(RSYSLOGD_TCP_CONF.format(logfile=logfile, port=port), file=fp)
-
     def _wait_until_running(self):
         # Wait until the rsyslogd port is available, but if it is not up in
         # five seconds assume that it has failed to start
@@ -63,7 +60,7 @@ def _wait_until_running(self):
     def start(self):
         # Start rsyslogd in the foreground
         # pylint: disable=consider-using-with
-        self.process = Popen([RSYSLOGD, "-f", self.conffile, "-i", "NONE", "-n", "-C"])
+        self.process = Popen([RSYSLOGD, "-d", "-f", self.conffile, "-i", "NONE", "-n", "-C"])
         self._wait_until_running()
 
     def stop(self):
@@ -124,7 +121,8 @@ def _run_pump_test(*, config_path, logfile):
 
 
 def test_rsyslogd_tcp_sender(tmpdir):
-    workdir = tmpdir.dirname
+    port = random.randrange(49152, 65536)
+    workdir = str(tmpdir.mkdir(f"{port}"))
     logfile = "{}/test.log".format(workdir)
     config_path = "{}/journalpump.json".format(workdir)
     with open(config_path, "w") as fp:
@@ -137,7 +135,7 @@ def test_rsyslogd_tcp_sender(tmpdir):
                             "rsyslog": {
                                 "output_type": "rsyslog",
                                 "rsyslog_server": "127.0.0.1",
-                                "rsyslog_port": 5140,
+                                "rsyslog_port": port,
                                 "format": "custom",
                                 "logline": "<%pri%>%timestamp% %HOSTNAME% %app-name%[%procid%]: %msg% {%%} %not-valid-tag%",
                             },
@@ -147,7 +145,11 @@ def test_rsyslogd_tcp_sender(tmpdir):
             },
             fp,
         )
-    rsyslogd = _TestRsyslogd(workdir=workdir, logfile=logfile, port=5140)
+    rsyslogd_config_path = "{}/rsyslogd.conf".format(workdir)
+    with open(rsyslogd_config_path, "w") as fp:
+        fp.write(RSYSLOGD_TCP_CONF.format(logfile=logfile, port=port))
+
+    rsyslogd = _TestRsyslogd(config_file=rsyslogd_config_path, port=port)
     try:
         rsyslogd.start()
         _run_pump_test(config_path=config_path, logfile=logfile)