svn commit: r1655187 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java

[gc...@apache.org]

Author: gchanan
Date: Tue Jan 27 23:00:16 2015
New Revision: 1655187

URL: http://svn.apache.org/r1655187
Log:
SOLR-6915: Avoid broken Locales and skip IBM J9

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java?rev=1655187&r1=1655186&r2=1655187&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java Tue Jan 27 23:00:16 2015
@@ -6,9 +6,12 @@ import com.carrotsearch.randomizedtestin
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import javax.security.auth.login.Configuration;
 
+import org.apache.lucene.util.Constants;
 import org.apache.hadoop.minikdc.MiniKdc;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.cloud.SaslZkACLProvider;
@@ -48,11 +51,20 @@ public class SaslZkACLProviderTest exten
       .getLogger(SaslZkACLProviderTest.class);
 
   private static final Charset DATA_ENCODING = Charset.forName("UTF-8");
+  // These Locales don't generate dates that are compatibile with Hadoop MiniKdc.
+  protected final static List<String> brokenLocales =
+    Arrays.asList(
+      "th_TH_TH_#u-nu-thai",
+      "ja_JP_JP_#u-ca-japanese",
+      "hi_IN");
+  protected Locale savedLocale = null;
 
   protected ZkTestServer zkServer;
 
   @BeforeClass
   public static void beforeClass() {
+    assumeFalse("FIXME: SOLR-7040: This test fails under IBM J9",
+                Constants.JAVA_VENDOR.startsWith("IBM"));
     System.setProperty("solrcloud.skip.autorecovery", "true");
   }
   
@@ -64,6 +76,10 @@ public class SaslZkACLProviderTest exten
   @Override
   public void setUp() throws Exception {
     super.setUp();
+    if (brokenLocales.contains(Locale.getDefault().toString())) {
+      savedLocale = Locale.getDefault();
+      Locale.setDefault(Locale.US);
+    }
     log.info("####SETUP_START " + getTestName());
     createTempDir();
 
@@ -107,7 +123,10 @@ public class SaslZkACLProviderTest exten
   @Override
   public void tearDown() throws Exception {
     zkServer.shutdown();
-    
+
+    if (savedLocale != null) {
+      Locale.setDefault(savedLocale);
+    }
     super.tearDown();
   }