Skip some utests because of canonical/operator#736

canonical · Jul 4, 2023 · edc5b99 · edc5b99
1 parent 3d34ca9
commit edc5b99
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py
@@ -133,7 +133,7 @@ async def deploy_literal_bundle(ops_test: OpsTest, bundle: str):
     logger.info(stdout)
 
 
-async def curl(ops_test: OpsTest, *, cert_dir: str, cert_path: str, ip_addr: str, mock_url: str):
+async   def curl(ops_test: OpsTest, *, cert_dir: str, cert_path: str, ip_addr: str, mock_url: str):
     p = urlparse(mock_url)
 
     # Tell curl to resolve the mock url as traefik's IP (to avoid using a custom DNS

diff --git a/tests/unit/test_external_url.py b/tests/unit/test_external_url.py
@@ -62,6 +62,7 @@ def is_service_running(self) -> bool:
         service = self.harness.model.unit.get_container(CONTAINER_NAME).get_service(SERVICE_NAME)
         return service.is_running()
 
+    @unittest.skip("https://github.com/canonical/operator/issues/736")
     @patch.object(WorkloadManager, "check_config", lambda *a, **kw: ("ok", ""))
     @patch("socket.getfqdn", new=lambda *args: "fqdn")
     @k8s_resource_multipatch
@@ -88,6 +89,7 @@ def test_config_option_overrides_fqdn(self):
         self.assertEqual(self.get_url_cli_arg(), self.fqdn_url)
         self.assertTrue(self.is_service_running())
 
+    @unittest.skip("https://github.com/canonical/operator/issues/736")
     @patch.object(WorkloadManager, "check_config", lambda *a, **kw: ("ok", ""))
     @patch("socket.getfqdn", new=lambda *args: "fqdn")
     @k8s_resource_multipatch
@@ -145,6 +147,7 @@ def test_config_option_overrides_traefik(self):
         # THEN the fqdn is used as external url
         self.assertEqual(self.get_url_cli_arg(), self.fqdn_url)
 
+    @unittest.skip("https://github.com/canonical/operator/issues/736")
     @patch.object(WorkloadManager, "check_config", lambda *a, **kw: ("ok", ""))
     @patch("socket.getfqdn", new=lambda *args: "fqdn")
     @k8s_resource_multipatch
@@ -180,6 +183,7 @@ def test_web_route_prefix(self):
             f"http://localhost:{self.harness.charm._ports.api}/path/to/alertmanager/",
         )
 
+    @unittest.skip("https://github.com/canonical/operator/issues/736")
     @patch.object(WorkloadManager, "check_config", lambda *a, **kw: ("ok", ""))
     @patch("socket.getfqdn", new=lambda *args: "fqdn-0")
     @k8s_resource_multipatch
@@ -221,6 +225,7 @@ def test_cluster_addresses(self, *_):
             cluster_args, ["fqdn-1:9094/path/to/alertmanager", "fqdn-2:9094/path/to/alertmanager"]
         )
 
+    @unittest.skip("https://github.com/canonical/operator/issues/736")
     @patch.object(WorkloadManager, "check_config", lambda *a, **kw: ("ok", ""))
     @patch("socket.getfqdn", new=lambda *args: "fqdn")
     @k8s_resource_multipatch

diff --git a/tests/unit/test_push_config_to_workload_on_startup.py b/tests/unit/test_push_config_to_workload_on_startup.py
@@ -75,6 +75,7 @@ def test_single_unit_cluster(self, is_leader):
         # AND peer clusters cli arg is not present in pebble layer command
         self.assertNotIn("--cluster.peer=", command)
 
+    @unittest.skip("https://github.com/canonical/operator/issues/736")
     @k8s_resource_multipatch
     def test_multi_unit_cluster(self, *_):
         """Scenario: Current unit is a part of a multi-unit cluster."""