Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-13988: Harden CreateCollectionCleanupTest. Incorporate Dawid Weiss' suggestion for windows

This commit is contained in:
Erick Erickson 2019-12-06 19:10:27 -05:00
parent 155ab116a2
commit 7d5d44a3c4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
View File

@ -21,6 +21,7 @@ import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.not;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Properties; import java.util.Properties;
import org.apache.solr.client.solrj.impl.BaseHttpSolrClient; import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;
@ -78,7 +79,8 @@ public class CreateCollectionCleanupTest extends SolrCloudTestCase {
Properties properties = new Properties(); Properties properties = new Properties();
Path tmpDir = createTempDir(); Path tmpDir = createTempDir();
tmpDir.toFile().setWritable(false); tmpDir = tmpDir.resolve("foo");
Files.createFile(tmpDir);
properties.put(CoreAdminParams.DATA_DIR, tmpDir.toString()); properties.put(CoreAdminParams.DATA_DIR, tmpDir.toString());
create.setProperties(properties); create.setProperties(properties);
expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> { expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> {
@ -102,7 +104,8 @@ public class CreateCollectionCleanupTest extends SolrCloudTestCase {
Properties properties = new Properties(); Properties properties = new Properties();
Path tmpDir = createTempDir(); Path tmpDir = createTempDir();
tmpDir.toFile().setWritable(false); tmpDir = tmpDir.resolve("foo");
Files.createFile(tmpDir);
properties.put(CoreAdminParams.DATA_DIR, tmpDir.toString()); properties.put(CoreAdminParams.DATA_DIR, tmpDir.toString());
create.setProperties(properties); create.setProperties(properties);
create.setAsyncId("testAsyncCreateCollectionCleanup"); create.setAsyncId("testAsyncCreateCollectionCleanup");