diff --git a/requirements.txt b/requirements.txt index 0f687aee224465c59e96f3537a93dc975bd4bebd..c3985b01a07e51934cc430774785d4be6cd01ef9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,11 +5,11 @@ certifi>=2019.3.9 # Needed for ansible k8s resource openshift>=0.8.6 # Needed for testinfra using the ansible module -paramiko +paramiko>=2.7.0 psutil>=5.5.0 pyopenssl>=19.0.0 pytest>=4.3.0 -pytest-rerunfailures +pytest-rerunfailures>=8.0 requests>=2.19.1 tabulate>=0.8.3 testinfra>=3.0.0 diff --git a/test/pytest.ini b/test/pytest.ini index d3dc444a35b02c1c3a48e6f14ea522c6fca17087..7676b2263cecd2a2fa0ec4c894af54b8b3ccd1ae 100644 --- a/test/pytest.ini +++ b/test/pytest.ini @@ -4,7 +4,7 @@ markers = certs: Run tests related to TLS certificates testinfra: Run testinfra tests (test OS/package versions etc) prometheus: Test prometheus - helmreleases: Test delpoyed helmreleases installed by weave flux + helmreleases: Test deployed helmreleases installed by flux # https://docs.pytest.org/en/latest/warnings.html filterwarnings = diff --git a/test/pytest/test_helmreleases.py b/test/pytest/test_helmreleases.py index 11e875de81c9c02a5c54159ff4e1c13c4f17719a..18bbf5fb2662f5417214ac70be99972a6786c3c1 100644 --- a/test/pytest/test_helmreleases.py +++ b/test/pytest/test_helmreleases.py @@ -26,7 +26,7 @@ def get_release(name, namespace, api): print("Exception: %s" % e) print("**** NOT DEPLOYED, status: %s *****" % release_status) - return(release_name, release_status) + return(release_status) @pytest.mark.helmreleases @@ -43,12 +43,11 @@ def test_helmreleases(): customObjects = client.CustomObjectsApi() failed = 0 - # test_release('nextcloud', 'oas-apps') print('\n') for namespace in expected_releases: for app in expected_releases[namespace]: app_status = get_release(app, namespace, customObjects) - if app_status[1] != 'DEPLOYED': + if app_status != 'DEPLOYED': failed += 1 assert failed == 0, "Error: %s apps NOT DEPLOYED !" % failed