wait_for() added to explicitly wait for operator reconciliation. Unnecessary logs removed.

Author: cathal-bailey

testsuite/tests/apicast_operator/test_user_env_var.py

@@ -22,7 +22,6 @@
 def gw_with_user_env(staging_gateway, logger):
     """
     Adds environment variables to the APIcast deployment.
-    A change to log level forces operator reconciliation.
     """
 
     test_env_var_name = "APICAST_PATH_ROUTING_ONLY"
@@ -37,19 +36,17 @@ def gw_with_user_env(staging_gateway, logger):
     environ.refresh()
     assert environ[test_env_var_name] == test_env_var_value, "Env var was not set correctly"
 
-    # Trigger reconciliation by modifying a supported env var that goes through the operator
-    logger.info("Triggering operator reconciliation...")
-    staging_gateway.environ["APICAST_LOG_LEVEL"] = "debug"
+    return environ, test_env_var_name, test_env_var_value
 
-    return staging_gateway, test_env_var_name, test_env_var_value
 
-
-def test_user_env_var_persists(gw_with_user_env, logger):
+def test_user_env_var_persists(gw_with_user_env, staging_gateway):
     """Verify user defined vars remain after reconciliation"""
-    staging_gateway, test_env_var_name, test_env_var_value = gw_with_user_env
+    environ, test_env_var_name, test_env_var_value = gw_with_user_env
+
+    # Trigger reconciliation by modifying a supported env var that goes through the operator
+    staging_gateway.environ["APICAST_LOG_LEVEL"] = "debug"
+    staging_gateway.deployment.wait_for()
 
-    logger.info("Checking if user-defined env var persists after reconciliation...")
-    environ = staging_gateway.deployment.environ()
     environ.refresh()
 
     try: