Repository: hadoop Updated Branches: refs/heads/branch-2 fcf3dc597 -> 17797c73c
HADOOP-11549. flaky test detection tool failed to handle special control characters in test result. Contributed by Yongjun Zhang. (cherry picked from commit 5f4ef2d13fa3fa3d4d315902e55c7775ef08b3d2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/17797c73 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/17797c73 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/17797c73 Branch: refs/heads/branch-2 Commit: 17797c73c2faf07109440da32e9a93762d0b74db Parents: fcf3dc5 Author: Akira Ajisaka <aajis...@apache.org> Authored: Wed Feb 4 14:17:00 2015 -0800 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Wed Feb 4 14:18:31 2015 -0800 ---------------------------------------------------------------------- dev-support/determine-flaky-tests-hadoop.py | 4 ++-- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/17797c73/dev-support/determine-flaky-tests-hadoop.py ---------------------------------------------------------------------- diff --git a/dev-support/determine-flaky-tests-hadoop.py b/dev-support/determine-flaky-tests-hadoop.py old mode 100644 new mode 100755 index 6f16ba5..ce152ba --- a/dev-support/determine-flaky-tests-hadoop.py +++ b/dev-support/determine-flaky-tests-hadoop.py @@ -92,10 +92,10 @@ def load_url_data(url): ourl = urllib.request.urlopen(url) codec = ourl.info().get_param('charset') content = ourl.read().decode(codec) - data = simplejson.loads(content) + data = simplejson.loads(content, strict=False) else: ourl = urllib2.urlopen(url) - data = simplejson.load(ourl) + data = simplejson.load(ourl, strict=False) return data """ List all builds of the target project. """ http://git-wip-us.apache.org/repos/asf/hadoop/blob/17797c73/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3f6adce..05346f2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -482,6 +482,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11547. hadoop-common native compilation fails on Windows due to missing support for __attribute__ declaration. (cnauroth) + HADOOP-11549. flaky test detection tool failed to handle special control + characters in test result. (Yongjun Zhang via aajisaka) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES
