From 867ca53ab4a0f36077ae089e5d80dc32d367e095 Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Tue, 12 Apr 2022 22:55:41 +1000 Subject: [PATCH] Fix: Do not fail tox if gerrit.acumos.org is down Issue-Id: RELENG-4181 Signed-off-by: Bengt Thuree Change-Id: I3a1228e77fd7fdc0ae723c26cff420da8f299fa3 --- tests/test_git.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/test_git.py b/tests/test_git.py index 341ad716..aa108a7a 100644 --- a/tests/test_git.py +++ b/tests/test_git.py @@ -35,7 +35,12 @@ def mock_init(mocker, datafiles): ciman_dir = os.path.join(str(datafiles), "ci-management") os.makedirs(ciman_dir) os.chdir(ciman_dir) - Repo.clone_from(remote, ciman_dir) + try: + Repo.clone_from(remote, ciman_dir) + except Exception as ex: + print(ex) + pytest.skip("Could not reach gerrit.acumos.org") + return None Repo.init(ciman_dir) mocker.patch("tempfile.mkdtemp", return_value=ciman_dir) @@ -53,6 +58,9 @@ def mock_init(mocker, datafiles): @pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "git")) def test_get_commit_hook(mock_init, responses, datafiles): + if not mock_init: + pytest.skip("Could not reach gerrit.acumos.org") + return os.chdir(str(datafiles)) ciman_dir = os.path.join(str(datafiles), "ci-management") hook_url = "http://gerrit.example.com/tools/hooks/commit-msg" @@ -66,6 +74,9 @@ def test_get_commit_hook(mock_init, responses, datafiles): @pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "git")) def test_add_info_job(mock_init, datafiles, mocker): + if not mock_init: + pytest.skip("Could not reach gerrit.acumos.org") + return fqdn = "gerrit.example.com" gerrit_project = "project/subproject" issue_id = "TEST-123" @@ -99,6 +110,9 @@ project: @pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "git")) def test_add_git_review(mock_init, datafiles, mocker): + if not mock_init: + pytest.skip("Could not reach gerrit.acumos.org") + return fqdn = "gerrit.example.com" gerrit_project = "project/subproject" issue_id = "TEST-123" @@ -122,6 +136,9 @@ defaultbranch=master""" @pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "git")) def test_add_maven_config(mock_init, datafiles, mocker): + if not mock_init: + pytest.skip("Could not reach gerrit.acumos.org") + return fqdn = "gerrit.example.com" gerrit_project = "project/subproject" issue_id = "TEST-123" -- 2.16.6