Extend wait time in exporter tests + revert ops dependency to <2.10.0

Author: shayancanonical

poetry.lock

@@ -10,16 +10,17 @@ authors = []
 
 [tool.poetry.dependencies]
 python = "^3.8.1"  # ^3.8.1 required by flake8
-ops = "^2.12.0"
+ops = "<2.10.0"
 tenacity = "^8.2.3"
 poetry-core = "^1.7.0"
 jinja2 = "^3.1.2"
 requests = "^2.31.0"
 
 [tool.poetry.group.charm-libs.dependencies]
 # data_platform_libs/v0/data_interfaces.py
-ops = ">=2.12.0"
-# tls_certificates_interface/v1/tls_certificates.py
+ops = "<2.10.0"
+# tls_certificates_interface/v2/tls_certificates.py
+# tls_certificates lib v2 uses a feature only available in cryptography >=42.0.5
 cryptography = ">=42.0.5"
 jsonschema = "*"
 # grafana_agent/v0/cos_agent.py
@@ -52,7 +53,7 @@ pytest = "^7.4.0"
 pytest-xdist = "^3.3.1"
 pytest-cov = "^4.1.0"
 ops-scenario = "^5.4.1"
-ops = ">=2.12.0"
+ops = "<2.10.0"
 pytest-mock = "^3.11.1"
 
 [tool.poetry.group.integration.dependencies]
@@ -64,7 +65,7 @@ pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workf
 juju = "3.2.0.1"
 mysql-connector-python = "~8.0.33"
 tenacity = "^8.2.2"
-ops = ">=2.12.0"
+ops = "<2.10.0"
 pytest-mock = "^3.11.1"
 
 

pyproject.toml

@@ -135,7 +135,7 @@ async def test_exporter_endpoint(ops_test: OpsTest, mysql_router_charm_series: s
         f"{GRAFANA_AGENT_APP_NAME}:cos-agent", f"{MYSQL_ROUTER_APP_NAME}:cos-agent"
     )
 
-    time.sleep(30)
+    time.sleep(60)
 
     jmx_resp = http.request("GET", f"http://{unit_address}:49152/metrics")
     assert jmx_resp.status == 200, "❌ cannot connect to metrics endpoint with relation with cos"
@@ -148,7 +148,7 @@ async def test_exporter_endpoint(ops_test: OpsTest, mysql_router_charm_series: s
         f"{GRAFANA_AGENT_APP_NAME}:cos-agent", f"{MYSQL_ROUTER_APP_NAME}:cos-agent"
     )
 
-    time.sleep(30)
+    time.sleep(60)
 
     try:
         http.request("GET", f"http://{unit_address}:49152/metrics")
@@ -184,7 +184,7 @@ async def test_exporter_endpoint_with_tls(ops_test: OpsTest) -> None:
         f"{MYSQL_ROUTER_APP_NAME}:certificates", f"{TLS_APP_NAME}:certificates"
     )
 
-    time.sleep(30)
+    time.sleep(60)
 
     mysql_test_app = ops_test.model.applications[APPLICATION_APP_NAME]
     unit_address = await mysql_test_app.units[0].get_public_address()
@@ -203,7 +203,7 @@ async def test_exporter_endpoint_with_tls(ops_test: OpsTest) -> None:
         f"{GRAFANA_AGENT_APP_NAME}:cos-agent", f"{MYSQL_ROUTER_APP_NAME}:cos-agent"
     )
 
-    time.sleep(30)
+    time.sleep(60)
 
     jmx_resp = http.request("GET", f"http://{unit_address}:49152/metrics")
     assert jmx_resp.status == 200, "❌ cannot connect to metrics endpoint with relation with cos"
@@ -216,7 +216,7 @@ async def test_exporter_endpoint_with_tls(ops_test: OpsTest) -> None:
         f"{GRAFANA_AGENT_APP_NAME}:cos-agent", f"{MYSQL_ROUTER_APP_NAME}:cos-agent"
     )
 
-    time.sleep(30)
+    time.sleep(60)
 
     try:
         http.request("GET", f"http://{unit_address}:49152/metrics")