Moved back SPCS tests to integration tests (#2047)

Author: sfc-gh-astus

.github/workflows/test_integration_spcs.yaml

@@ -140,10 +140,7 @@ features = ["development"]
 
 [tool.hatch.envs.integration.scripts]
 test = [
-  "pytest -m integration -n6 --dist=worksteal --deflake-test-type=integration --ignore=tests_integration/spcs tests_integration/",
-]
-test-spcs = [
-  "pytest -m integration -n6 --dist=worksteal --deflake-test-type=integration tests_integration/spcs",
+  "pytest -m integration -n6 --dist=worksteal --deflake-test-type=integration tests_integration/",
 ]
 test_qa = [
   "pytest -m 'integration and not no_qa' -n6 --dist=worksteal --deflake-test-type=integration tests_integration/",

pyproject.toml

@@ -60,6 +60,7 @@ def remove_resources(single: str, plural: str, known_instances: t.List[str], rol
             "SNOWFLAKE_CONNECTIONS_INTEGRATION_PRIVATE_KEY_RAW"
         ),
         "database": "SNOWCLI_DB",
+        "schema": "public",
         "role": role,
     }
     config = {k: v for k, v in config.items() if v is not None}
@@ -78,6 +79,7 @@ def remove_resources(single: str, plural: str, known_instances: t.List[str], rol
         ("service", "services"): [],
         ("application", "applications"): [],
         ("warehouse", "warehouses"): ["XSMALL"],
+        ("image repository", "image repositories"): ["SNOWCLI_REPOSITORY"],
     }
 
     for (single, plural), known in known_objects.items():

scripts/cleanup.py

@@ -65,7 +65,6 @@ def test_get_registry_url(test_database, test_role, runner, snowflake_session):
 
 
 @pytest.mark.integration
-@pytest.mark.skip("Possibly flaky test")
 def test_registry_login(runner):
     result = runner.invoke_with_connection_json(["spcs", "image-registry", "login"])
     assert_that_result_is_successful_and_output_json_equals(

tests_integration/spcs/test_registry.py

@@ -23,7 +23,6 @@
 
 
 @pytest.mark.integration
-@pytest.mark.skip("Skipped temporarily")
 def test_services(_test_steps: Tuple[SnowparkServicesTestSteps, str]):
 
     test_steps, service_name = _test_steps
@@ -39,17 +38,16 @@ def test_services(_test_steps: Tuple[SnowparkServicesTestSteps, str]):
     test_steps.logs_should_return_service_logs(
         service_name, "hello-world", "Serving Flask app 'echo_service'"
     )
-    test_steps.suspend_service(service_name)
-    test_steps.wait_until_service_is_suspended(service_name)
-    test_steps.resume_service(service_name)
-    test_steps.wait_until_service_is_running(service_name)
     test_steps.describe_should_return_service(service_name)
     test_steps.list_endpoints_should_show_endpoint(service_name)
     test_steps.list_instances_should_show_instances(service_name)
     test_steps.list_containers_should_show_containers(service_name)
     test_steps.list_roles_should_show_roles(service_name)
     test_steps.upgrade_service_should_change_spec(service_name)
     test_steps.set_unset_service_property(service_name)
+    test_steps.suspend_service(service_name)
+    test_steps.wait_until_service_is_suspended(service_name)
+    test_steps.resume_service(service_name)
     test_steps.drop_service(service_name)
     test_steps.list_should_not_return_service(service_name)