Skip to content

Commit 9163d8a

Browse files
committed
Reorder tests
1 parent af38253 commit 9163d8a

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

tests/interop/test_validate_edge_site_components.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ def test_validate_edge_site_reachable(kube_config, openshift_dyn_client):
3030
logger.info("PASS: Edge site is reachable")
3131

3232

33+
@pytest.mark.validate_argocd_reachable_edge_site
34+
def test_validate_argocd_reachable_edge_site(openshift_dyn_client):
35+
logger.info("Check if argocd route/url on edge site is reachable")
36+
err_msg = components.validate_argocd_reachable(openshift_dyn_client)
37+
if err_msg:
38+
logger.error(f"FAIL: {err_msg}")
39+
assert False, err_msg
40+
else:
41+
logger.info("PASS: Argocd is reachable")
42+
43+
3344
@pytest.mark.check_pod_status_edge
3445
def test_check_pod_status(openshift_dyn_client):
3546
logger.info("Checking pod status")
@@ -39,7 +50,6 @@ def test_check_pod_status(openshift_dyn_client):
3950
"open-cluster-management-agent-addon",
4051
"openshift-gitops",
4152
]
42-
4353
err_msg = components.check_pod_status(openshift_dyn_client, projects)
4454
if err_msg:
4555
logger.error(f"FAIL: {err_msg}")
@@ -48,17 +58,6 @@ def test_check_pod_status(openshift_dyn_client):
4858
logger.info("PASS: Pod status check succeeded.")
4959

5060

51-
@pytest.mark.validate_argocd_reachable_edge_site
52-
def test_validate_argocd_reachable_edge_site(openshift_dyn_client):
53-
logger.info("Check if argocd route/url on edge site is reachable")
54-
err_msg = components.validate_argocd_reachable(openshift_dyn_client)
55-
if err_msg:
56-
logger.error(f"FAIL: {err_msg}")
57-
assert False, err_msg
58-
else:
59-
logger.info("PASS: Argocd is reachable")
60-
61-
6261
@pytest.mark.validate_argocd_applications_health_edge_site
6362
def test_validate_argocd_applications_health_edge_site(openshift_dyn_client):
6463
logger.info("Get all applications deployed by argocd on edge site")

0 commit comments

Comments
 (0)