Fix automatic vault login (#21126)

Author: lpramuk

conftest.py

@@ -2,8 +2,6 @@
 
 import pytest
 
-from robottelo.config import settings
-
 pytest_plugins = [
     # Plugins
     'pytest_plugins.auto_vault',
@@ -96,14 +94,3 @@ def pytest_runtest_makereport(item, call):
     # be "setup", "call", "teardown"
 
     setattr(item, "report_" + report.when, report)
-
-
-@pytest.hookimpl(hookwrapper=True)
-def pytest_runtest_protocol(item, nextitem):
-    """Set version source to upstream for tests marked with foremanctl."""
-    if item.get_closest_marker('foremanctl'):
-        settings.set('server.version.source', 'upstream')
-        yield
-        settings.set('server.version.source', 'internal')
-    else:
-        yield

tests/foreman/conftest.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from robottelo.config import settings
 from robottelo.hosts import Satellite
 from robottelo.logging import collection_logger
 
@@ -75,3 +76,14 @@ def ui_session_record_property(request, record_property):
             ):
                 sat = request.getfixturevalue(fixture)
                 sat.record_property = record_property
+
+
+@pytest.hookimpl(hookwrapper=True)
+def pytest_runtest_protocol(item, nextitem):
+    """Set version source to upstream for tests marked with foremanctl."""
+    if item.get_closest_marker('foremanctl'):
+        settings.set('server.version.source', 'upstream')
+        yield
+        settings.set('server.version.source', 'internal')
+    else:
+        yield