Merge pull request #426 from jsmolar/jsmolar-fix-branch

Moved custom test user name from utils to the blame method

testsuite/tests/conftest.py

@@ -226,6 +226,10 @@ def oidc_provider(keycloak) -> OIDCProvider:
 @pytest.fixture(scope="session")
 def blame(request):
     """Returns function that will add random identifier to the name"""
+    if "tester" in settings:
+        user = settings["tester"]
+    else:
+        user = _whoami()
 
     def _blame(name: str, tail: int = 3) -> str:
         """Create 'scoped' name within given test
@@ -247,7 +251,7 @@ def _blame(name: str, tail: int = 3) -> str:
         if "." in context:
             context = context.split(".")[0]
 
-        return randomize(f"{name[:8]}-{_whoami()[:8]}-{context[:9]}", tail=tail)
+        return randomize(f"{name[:8]}-{user[:8]}-{context[:9]}", tail=tail)
 
     return _blame
 

testsuite/utils.py

@@ -17,7 +17,6 @@
 from weakget import weakget
 
 from testsuite.certificates import Certificate, CFSSLClient, CertInfo
-from testsuite.config import settings
 
 MESSAGE_1KB = resources.files("testsuite.resources.performance.files").joinpath("message_1kb.txt")
 
@@ -46,9 +45,6 @@ def randomize(name, tail=5):
 
 def _whoami():
     """Returns username"""
-    if "tester" in settings:
-        return settings["tester"]
-
     try:
         return getpass.getuser()
     # want to catch broad exception and fallback at any circumstance