From aefadb838c57d2156aa541cc21182a08f1abaa39 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 5 May 2015 12:39:24 +0900 Subject: [PATCH] HADOOP-11916. TestStringUtils#testLowerAndUpperStrings failed on MAC due to a JVM bug. Contributed by Ming Ma. (cherry picked from commit 338e88a19eeb01364c7f5bcdc5f4b5c35d53852d) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/util/TestStringUtils.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 945c9dbe2ce..fd5bb4b3842 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -141,6 +141,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11900. Add failIfNoTests=false to hadoop-build-tools pom. (gera) + HADOOP-11916. TestStringUtils#testLowerAndUpperStrings failed on MAC + due to a JVM bug. (Ming Ma via ozawa) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java index 515c3e0c0ee..5b0715fdde9 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java @@ -37,6 +37,7 @@ import java.util.regex.Pattern; import org.apache.hadoop.test.UnitTestcaseTimeLimit; import org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; +import org.junit.Assume; import org.junit.Test; public class TestStringUtils extends UnitTestcaseTimeLimit { @@ -416,6 +417,9 @@ public class TestStringUtils extends UnitTestcaseTimeLimit { @Test public void testLowerAndUpperStrings() { + // Due to java bug http://bugs.java.com/bugdatabase/view_bug.do?bug_id=8047340, + // The test will fail with Turkish locality on Mac OS. + Assume.assumeTrue(Shell.LINUX); Locale defaultLocale = Locale.getDefault(); try { Locale.setDefault(new Locale("tr", "TR"));