generated from hybrid-cloud-patterns/example
-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #122 from validatedpatterns/refactor_pytest
Updates for code consolidation
- Loading branch information
Showing
2 changed files
with
12 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| import difflib | ||
| import logging | ||
| import os | ||
| import re | ||
| import subprocess | ||
|
|
||
| import pytest | ||
| from validatedpatterns_tests.interop import subscription | ||
|
|
@@ -23,110 +19,11 @@ def test_subscription_status_hub(openshift_dyn_client): | |
| "grafana-operator": ["xraylab-1"], | ||
| } | ||
|
|
||
| operator_versions = [] | ||
| missing_subs = [] | ||
| unhealthy_subs = [] | ||
| missing_installplans = [] | ||
| upgrades_pending = [] | ||
|
|
||
| ( | ||
| operator_versions, | ||
| missing_subs, | ||
| unhealthy_subs, | ||
| missing_installplans, | ||
| upgrades_pending, | ||
| ) = subscription.subscription_status(openshift_dyn_client, expected_subs) | ||
|
|
||
| if missing_subs: | ||
| logger.error(f"FAIL: The following subscriptions are missing: {missing_subs}") | ||
| if unhealthy_subs: | ||
| logger.error( | ||
| "FAIL: The following subscriptions are unhealthy:" f" {unhealthy_subs}" | ||
| ) | ||
| if missing_installplans: | ||
| logger.error( | ||
| "FAIL: The install plan for the following subscriptions is" | ||
| f" missing: {missing_installplans}" | ||
| ) | ||
| if upgrades_pending: | ||
| logger.error( | ||
| "FAIL: The following subscriptions are in UpgradePending state:" | ||
| f" {upgrades_pending}" | ||
| ) | ||
|
|
||
| cluster_version = subscription.openshift_version(openshift_dyn_client) | ||
| logger.info(f"Openshift version:\n{cluster_version.instance.status.history}") | ||
|
|
||
| if os.getenv("EXTERNAL_TEST") != "true": | ||
| shortversion = re.sub("(.[0-9]+$)", "", os.getenv("OPENSHIFT_VER")) | ||
| currentfile = os.getcwd() + "/operators_hub_current" | ||
| sourceFile = open(currentfile, "w") | ||
| for line in operator_versions: | ||
| logger.info(line) | ||
| print(line, file=sourceFile) | ||
| sourceFile.close() | ||
|
|
||
| logger.info("Clone operator-versions repo") | ||
| try: | ||
| operator_versions_repo = ( | ||
| "[email protected]:mpqe/mps/vp/operator-versions.git" | ||
| ) | ||
| clone = subprocess.run( | ||
| ["git", "clone", operator_versions_repo], capture_output=True, text=True | ||
| ) | ||
| logger.info(clone.stdout) | ||
| logger.info(clone.stderr) | ||
| except Exception: | ||
| pass | ||
|
|
||
| previouspath = ( | ||
| os.getcwd() + f"/operator-versions/medicaldiag_hub_{shortversion}" | ||
| ) | ||
| previousfile = f"medicaldiag_hub_{shortversion}" | ||
|
|
||
| logger.info("Ensure previous file exists") | ||
| checkpath = os.path.exists(previouspath) | ||
| logger.info(checkpath) | ||
|
|
||
| if checkpath is True: | ||
| logger.info("Diff current operator list with previous file") | ||
| diff = opdiff(open(previouspath).readlines(), open(currentfile).readlines()) | ||
| diffstring = "".join(diff) | ||
| logger.info(diffstring) | ||
|
|
||
| logger.info("Write diff to file") | ||
| sourceFile = open("operator_diffs_hub.log", "w") | ||
| print(diffstring, file=sourceFile) | ||
| sourceFile.close() | ||
| else: | ||
| logger.info("Skipping operator diff - previous file not found") | ||
|
|
||
| if missing_subs or unhealthy_subs or missing_installplans or upgrades_pending: | ||
| err_msg = "Subscription status check failed" | ||
| err_msg = subscription.subscription_status( | ||
| openshift_dyn_client, expected_subs, diff=True | ||
| ) | ||
| if err_msg: | ||
| logger.error(f"FAIL: {err_msg}") | ||
| assert False, err_msg | ||
| else: | ||
| # Only push the new operarator list if the test passed | ||
| # and we are not testing a pre-release operator nor | ||
| # running externally | ||
| if os.getenv("EXTERNAL_TEST") != "true": | ||
| if checkpath is True and not os.environ["INDEX_IMAGE"]: | ||
| os.remove(previouspath) | ||
| os.rename(currentfile, previouspath) | ||
|
|
||
| cwd = os.getcwd() + "/operator-versions" | ||
| logger.info(f"CWD: {cwd}") | ||
|
|
||
| logger.info("Push new operator list") | ||
| subprocess.run(["git", "add", previousfile], cwd=cwd) | ||
| subprocess.run( | ||
| ["git", "commit", "-m", "Update operator versions list"], | ||
| cwd=cwd, | ||
| ) | ||
| subprocess.run(["git", "push"], cwd=cwd) | ||
|
|
||
| logger.info("PASS: Subscription status check passed") | ||
|
|
||
|
|
||
| def opdiff(*args): | ||
| return filter(lambda x: not x.startswith(" "), difflib.ndiff(*args)) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters