Revert "tests: remove duplicate healthchecks, bump grafana and dex"
This reverts commit df9d8e9d25.
			
			
This commit is contained in:
		| @ -30,7 +30,7 @@ class TestProviderOAuth2Github(SeleniumTestCase): | ||||
|     def get_container_specs(self) -> Optional[dict[str, Any]]: | ||||
|         """Setup client grafana container which we test OAuth against""" | ||||
|         return { | ||||
|             "image": "grafana/grafana:9.1.2", | ||||
|             "image": "grafana/grafana:7.1.0", | ||||
|             "detach": True, | ||||
|             "network_mode": "host", | ||||
|             "auto_remove": True, | ||||
|  | ||||
| @ -36,7 +36,7 @@ class TestProviderOAuth2OAuth(SeleniumTestCase): | ||||
|  | ||||
|     def get_container_specs(self) -> Optional[dict[str, Any]]: | ||||
|         return { | ||||
|             "image": "grafana/grafana:9.1.2", | ||||
|             "image": "grafana/grafana:7.1.0", | ||||
|             "detach": True, | ||||
|             "network_mode": "host", | ||||
|             "auto_remove": True, | ||||
|  | ||||
| @ -6,6 +6,7 @@ from unittest.case import skipUnless | ||||
|  | ||||
| from docker import DockerClient, from_env | ||||
| from docker.models.containers import Container | ||||
| from docker.types import Healthcheck | ||||
| from selenium.webdriver.common.by import By | ||||
| from selenium.webdriver.support import expected_conditions as ec | ||||
|  | ||||
| @ -44,6 +45,11 @@ class TestProviderOAuth2OIDC(SeleniumTestCase): | ||||
|             detach=True, | ||||
|             network_mode="host", | ||||
|             auto_remove=True, | ||||
|             healthcheck=Healthcheck( | ||||
|                 test=["CMD", "wget", "--spider", "http://localhost:9009/health"], | ||||
|                 interval=5 * 100 * 1000000, | ||||
|                 start_period=1 * 100 * 1000000, | ||||
|             ), | ||||
|             environment={ | ||||
|                 "OIDC_CLIENT_ID": self.client_id, | ||||
|                 "OIDC_CLIENT_SECRET": self.client_secret, | ||||
|  | ||||
| @ -6,6 +6,7 @@ from unittest.case import skipUnless | ||||
|  | ||||
| from docker import DockerClient, from_env | ||||
| from docker.models.containers import Container | ||||
| from docker.types import Healthcheck | ||||
| from selenium.webdriver.common.by import By | ||||
| from selenium.webdriver.support import expected_conditions as ec | ||||
|  | ||||
| @ -44,6 +45,11 @@ class TestProviderOAuth2OIDCImplicit(SeleniumTestCase): | ||||
|             detach=True, | ||||
|             network_mode="host", | ||||
|             auto_remove=True, | ||||
|             healthcheck=Healthcheck( | ||||
|                 test=["CMD", "wget", "--spider", "http://localhost:9009/health"], | ||||
|                 interval=5 * 100 * 1000000, | ||||
|                 start_period=1 * 100 * 1000000, | ||||
|             ), | ||||
|             environment={ | ||||
|                 "OIDC_CLIENT_ID": self.client_id, | ||||
|                 "OIDC_CLIENT_SECRET": self.client_secret, | ||||
|  | ||||
| @ -6,6 +6,7 @@ from unittest.case import skipUnless | ||||
|  | ||||
| from docker import DockerClient, from_env | ||||
| from docker.models.containers import Container | ||||
| from docker.types import Healthcheck | ||||
| from selenium.webdriver.common.by import By | ||||
| from selenium.webdriver.support import expected_conditions as ec | ||||
|  | ||||
| @ -43,6 +44,11 @@ class TestProviderSAML(SeleniumTestCase): | ||||
|             detach=True, | ||||
|             network_mode="host", | ||||
|             auto_remove=True, | ||||
|             healthcheck=Healthcheck( | ||||
|                 test=["CMD", "wget", "--spider", "http://localhost:9009/health"], | ||||
|                 interval=5 * 100 * 1000000, | ||||
|                 start_period=1 * 100 * 1000000, | ||||
|             ), | ||||
|             environment={ | ||||
|                 "SP_ENTITY_ID": provider.issuer, | ||||
|                 "SP_SSO_BINDING": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST", | ||||
|  | ||||
| @ -106,7 +106,7 @@ class TestSourceOAuth2(SeleniumTestCase): | ||||
|  | ||||
|     def get_container_specs(self) -> Optional[dict[str, Any]]: | ||||
|         return { | ||||
|             "image": "ghcr.io/dexidp/dex:v2.33.0", | ||||
|             "image": "ghcr.io/dexidp/dex:v2.28.1", | ||||
|             "detach": True, | ||||
|             "network_mode": "host", | ||||
|             "auto_remove": True, | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Jens Langhammer
					Jens Langhammer