From 4a19099ee7e9e79358a3e72857e1e5a06c6fc5a7 Mon Sep 17 00:00:00 2001 From: ricolin Date: Wed, 27 Nov 2024 16:39:52 +0800 Subject: [PATCH] fix functional test cache --- magnum_cluster_api/tests/conftest.py | 14 ++++++++++++++ magnum_cluster_api/tests/functional/conftest.py | 1 + 2 files changed, 15 insertions(+) diff --git a/magnum_cluster_api/tests/conftest.py b/magnum_cluster_api/tests/conftest.py index 8dcbbf2d..cd572e7f 100644 --- a/magnum_cluster_api/tests/conftest.py +++ b/magnum_cluster_api/tests/conftest.py @@ -95,6 +95,12 @@ def mock_osc(session_mocker, image): ) ) + # Nova + + mock_nova_client = mock_clients.nova.return_value + mock_nova_client.server_groups.create.return_value = ( + openstack.compute.v2.server_group.ServerGroup(id=uuidutils.generate_uuid()) + ) # Glance mock_glance_client = mock_clients.glance.return_value mock_glance_client.images.get.return_value = image @@ -273,3 +279,11 @@ def server_side_apply_matcher(): "force": "True", } ) + + +@pytest.fixture(scope="session") +def mock_cache(session_mocker): + session_mocker.patch( + "magnum_cluster_api.cache.ServerGroupCache.get", return_value=None + ) + session_mocker.patch("magnum_cluster_api.cache.ServerGroupCache.set") diff --git a/magnum_cluster_api/tests/functional/conftest.py b/magnum_cluster_api/tests/functional/conftest.py index a59a9b92..d7dccb94 100644 --- a/magnum_cluster_api/tests/functional/conftest.py +++ b/magnum_cluster_api/tests/functional/conftest.py @@ -25,6 +25,7 @@ def cluster( mock_validate_cluster, mock_osc, mock_certificates, + mock_cache, ): try: ubuntu_driver.create_cluster(context, cluster_obj, 60)