fix tests

Author: gaelgatelement

tests/manifests/test_labels.py

@@ -132,7 +132,7 @@ async def test_our_labels_are_named_consistently(templates):
             )
 
 
-@pytest.mark.parametrize("values_file", values_files_to_test)
+@pytest.mark.parametrize("values_file", workloads_values_files_to_test)
 @pytest.mark.asyncio_cooperative
 async def test_workloads_selector_matches_labels(templates):
     for template in templates:

tests/manifests/test_volumes_mounts.py

@@ -37,7 +37,7 @@ async def test_volumes_mounts_exists(release_name, templates, other_secrets):
                         f"Volume {volume['secret']['secretName']} not found in Secret names:"
                         f"{secrets_names} for {template_id(template)}"
                     )
-                    assert re.match(r"^((as|secret)-\d+|secret-generated)$", volume["name"]), (
+                    assert re.match(r"^((as)-\d+|(secret)-[a-z0-9]{12}|secret-generated)$", volume["name"]), (
                         f"{template_id(template)} contains a Secret mounted with an unexpected name: {volume['name']}"
                     )
                 if "configMap" in volume:
@@ -50,6 +50,8 @@ async def test_volumes_mounts_exists(release_name, templates, other_secrets):
                         "haproxy-config",
                         "nginx-config",
                         "plain-config",
+                        "plain-syn-config",
+                        "plain-mas-config",
                         "synapse-haproxy",
                         "well-known-haproxy",
                     ], f"{template_id(template)} contains a ConfigMap mounted with an unexpected name: {volume['name']}"