From 7dcb99496fd8a10c2c9d2df34a2ef45a510bbbdb Mon Sep 17 00:00:00 2001 From: lizy <87583038+LizyBbethy@users.noreply.github.com> Date: Fri, 29 Oct 2021 19:05:53 +0300 Subject: [PATCH] Support other issue or bug tracker when parsing problem list #2906 (#3030) --- disabledTestParser/ProblemList.json | 4 ++-- disabledTestParser/generateDisabledTestListJson.py | 2 +- disabledTestParser/issue_status.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/disabledTestParser/ProblemList.json b/disabledTestParser/ProblemList.json index 41096eb585..5758240039 100644 --- a/disabledTestParser/ProblemList.json +++ b/disabledTestParser/ProblemList.json @@ -3,13 +3,13 @@ "JDK_IMPL" : "hotspot", "TARGET" : "jdk_custom", "CUSTOM_TARGET" : "java/lang/ClassLoader/nativeLibrary/NativeLibraryTest.java", - "GIT_ISSUE" : "https://github.com/adoptium/temurin-build/issues/248", + "ISSUE_TRACKER" : "https://github.com/adoptium/temurin-build/issues/248", "PLATFORM" : "all" },{ "JDK_VERSION" : 16, "JDK_IMPL" : "openj9", "TARGET" : "jdk_custom", "CUSTOM_TARGET" : "java/lang/ClassLoader/Assert.java", - "GIT_ISSUE" : "https://github.com/eclipse-openj9/openj9/issues/6668", + "ISSUE_TRACKER" : "https://github.com/eclipse-openj9/openj9/issues/6668", "PLATFORM" : "x86-64_mac" }] \ No newline at end of file diff --git a/disabledTestParser/generateDisabledTestListJson.py b/disabledTestParser/generateDisabledTestListJson.py index a57d06b05f..42398bd0e4 100644 --- a/disabledTestParser/generateDisabledTestListJson.py +++ b/disabledTestParser/generateDisabledTestListJson.py @@ -76,7 +76,7 @@ def get_test_details(test): test_tokens = test.split() test_details_dict["TARGET"] = "jdk_custom" test_details_dict["CUSTOM_TARGET"] = test_tokens[0] - test_details_dict["GIT_ISSUE"] = test_tokens[1] + test_details_dict["ISSUE_TRACKER"] = test_tokens[1] test_details_dict["PLATFORM"] = resolve_platform(test_tokens[2]) return test_details_dict diff --git a/disabledTestParser/issue_status.py b/disabledTestParser/issue_status.py index 6b6e694ba3..8060b3e230 100644 --- a/disabledTestParser/issue_status.py +++ b/disabledTestParser/issue_status.py @@ -4,7 +4,7 @@ def json_parser(json_obj): jsonLoad = json.loads(json_obj) - return jsonLoad["GIT_ISSUE"] + return jsonLoad["ISSUE_TRACKER"] def find_state(query_url): params = {'accept': 'application/vnd.github.v3+json', @@ -27,7 +27,7 @@ def main(): repo_issueUrl = git_issue_url.replace("https://github.com/", "") final_url = base_url + repo_issueUrl state = find_state(final_url) - j["GIT_ISSUE_STATUS"] = state + j["ISSUE_TRACKER_STATUS"] = state with open('output.json', 'w', encoding='utf-8') as f: json.dump(data, f, ensure_ascii=False, indent=4)