From 5216b200f4f416794af08f6d7d14cb882133a503 Mon Sep 17 00:00:00 2001
From: joshburt <jburt@anaconda.com>
Date: Mon, 11 Dec 2023 11:15:28 -0800
Subject: [PATCH] clenup and long wait

---
 tests/system/ae5_tools/cli/test_cli.py | 14 +-------------
 tests/system/ae5_tools/test_api.py     | 11 -----------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/tests/system/ae5_tools/cli/test_cli.py b/tests/system/ae5_tools/cli/test_cli.py
index 2850aef1..4710583e 100644
--- a/tests/system/ae5_tools/cli/test_cli.py
+++ b/tests/system/ae5_tools/cli/test_cli.py
@@ -292,18 +292,6 @@ def test_project_sessions(cli_session):
     slist = _cmd("project", "sessions", prec["id"])
     assert len(slist) == 1 and slist[0]["id"] == srec["id"]
 
-
-@pytest.mark.skip(reason="Disabling until CI is upgraded to 5.6.2")
-def test_session_branches_5_6_2(cli_session):
-    """Behavior updated in 5.6.2"""
-    prec, srec = cli_session
-    branches = _cmd("session", "branches", prec["id"])
-    bdict = {r["branch"]: r["sha1"] for r in branches}
-    assert set(bdict) == {"local", "master"}, branches
-    assert bdict["local"] == bdict["master"], branches
-
-
-@pytest.mark.skip(reason="Disabling until CI is upgraded to 5.7.0")
 def test_session_branches_5_7_0(cli_session):
     """Behavior updated in 5.7.0"""
     prec, srec = cli_session
@@ -351,7 +339,7 @@ def test_deploy(cli_deployment):
     prec, drec = cli_deployment
     assert drec["owner"] == prec["owner"], drec
     assert drec["project_name"] == prec["name"], drec
-    for attempt in range(3):
+    for attempt in range(10):
         try:
             ldata = _cmd("call", "/", "--endpoint", drec["endpoint"], table=False)
             break
diff --git a/tests/system/ae5_tools/test_api.py b/tests/system/ae5_tools/test_api.py
index 12a48ad4..2576d212 100644
--- a/tests/system/ae5_tools/test_api.py
+++ b/tests/system/ae5_tools/test_api.py
@@ -435,17 +435,6 @@ def test_project_sessions(user_session, api_session):
     assert len(slist) == 1 and slist[0]["id"] == srec["id"]
 
 
-@pytest.mark.skip(reason="Disabling until CI is upgraded to 5.6.2")
-def test_session_branches_5_6_2(user_session, api_session):
-    """Behavior changed in 5.6.2"""
-    prec, srec = api_session
-    branches = user_session.session_branches(srec, format="json")
-    bdict = {r["branch"]: r["sha1"] for r in branches}
-    assert set(bdict) == {"local", "master"}, branches
-    assert bdict["local"] == bdict["master"], branches
-
-
-@pytest.mark.skip(reason="Disabling until CI is upgraded to 5.7.0")
 def test_session_branches_5_7_0(user_session, api_session):
     """Behavior changed in 5.7.0"""
     prec, srec = api_session