Adding upstream version 1:9.18.24.upstream/1%9.18.24upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 11 deletions

diff --git a/bin/tests/system/statschannel/conftest.py b/bin/tests/system/statschannel/conftest.py
index 363dd7a..c26935b 100644
--- a/bin/tests/system/statschannel/conftest.py
+++ b/bin/tests/system/statschannel/conftest.py
@@ -9,17 +9,9 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 import pytest
 
 
-@pytest.fixture
-def statsport(request):
-    # pylint: disable=unused-argument
-    env_port = os.getenv("EXTRAPORT1")
-    if env_port is None:
-        env_port = 5301
-    else:
-        env_port = int(env_port)
-
-    return env_port
+@pytest.fixture(scope="module")
+def statsport(ports):
+    return ports["EXTRAPORT1"]