You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/09/07 09:57:33 UTC
[45/50] [abbrv] lucene-solr:apiv2: SOLR-9460: Fully fix test setup
SOLR-9460: Fully fix test setup
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e026ac4f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e026ac4f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e026ac4f
Branch: refs/heads/apiv2
Commit: e026ac4fe5d1bbb1c798699feeb39bf2efa15be2
Parents: 62f8b8d
Author: Uwe Schindler <us...@apache.org>
Authored: Sat Sep 3 20:30:30 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sat Sep 3 20:30:30 2016 +0200
----------------------------------------------------------------------
.../TestSolrCloudWithSecureImpersonation.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e026ac4f/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
index 3727620..ef41e4d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
@@ -58,16 +58,18 @@ public class TestSolrCloudWithSecureImpersonation extends SolrTestCaseJ4 {
private static SolrClient solrClient;
private static String getUsersFirstGroup() throws Exception {
- org.apache.hadoop.security.Groups hGroups =
- new org.apache.hadoop.security.Groups(new Configuration());
String group = "*"; // accept any group if a group can't be found
- try {
- List<String> g = hGroups.getGroups(System.getProperty("user.name"));
- if (g != null && g.size() > 0) {
- group = g.get(0);
+ if (!Constants.WINDOWS) { // does not work on Windows!
+ org.apache.hadoop.security.Groups hGroups =
+ new org.apache.hadoop.security.Groups(new Configuration());
+ try {
+ List<String> g = hGroups.getGroups(System.getProperty("user.name"));
+ if (g != null && g.size() > 0) {
+ group = g.get(0);
+ }
+ } catch (NullPointerException npe) {
+ // if user/group doesn't exist on test box
}
- } catch (NullPointerException npe) {
- // if user/group doesn't exist on test box
}
return group;
}
@@ -154,7 +156,9 @@ public class TestSolrCloudWithSecureImpersonation extends SolrTestCaseJ4 {
miniCluster.shutdown();
}
miniCluster = null;
- solrClient.close();
+ if (solrClient != null) {
+ solrClient.close();
+ }
solrClient = null;
System.clearProperty("authenticationPlugin");
System.clearProperty(KerberosPlugin.DELEGATION_TOKEN_ENABLED);