Skip to content

Commit 2e5fdd6

Browse files
committed
test: skip tests that assume a mock s3 (minio) server
1 parent f9fa96f commit 2e5fdd6

3 files changed

Lines changed: 22 additions & 6 deletions

File tree

src/test/java/org/janelia/saalfeldlab/n5/s3/AmazonS3KeyValueAccessTest.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package org.janelia.saalfeldlab.n5.s3;
22

3+
import static org.junit.Assume.assumeTrue;
4+
35
import org.janelia.saalfeldlab.n5.KeyValueAccess;
46
import org.janelia.saalfeldlab.n5.N5URI;
57
import org.janelia.saalfeldlab.n5.kva.AbstractKeyValueAccessTest;
68
import org.janelia.saalfeldlab.n5.s3.mock.MockS3Factory;
79
import org.junit.After;
10+
import org.junit.BeforeClass;
811
import org.junit.Ignore;
912
import org.junit.Test;
1013
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
@@ -16,7 +19,14 @@
1619
import java.util.ArrayList;
1720

1821
public class AmazonS3KeyValueAccessTest extends AbstractKeyValueAccessTest {
19-
22+
23+
@BeforeClass
24+
public static void before() {
25+
26+
MockS3Factory.getOrCreateS3();
27+
assumeTrue("mock s3 server not running", MockS3Factory.isMinioServerRunning());
28+
}
29+
2030
private ArrayList<AmazonS3KeyValueAccess> kvas;
2131

2232
@Override

src/test/java/org/janelia/saalfeldlab/n5/s3/N5AmazonS3MockTests.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
package org.janelia.saalfeldlab.n5.s3;
22

3-
import org.janelia.saalfeldlab.n5.s3.mock.MockS3Factory;
3+
import static org.junit.Assume.assumeTrue;
44

5+
import org.janelia.saalfeldlab.n5.s3.mock.MockS3Factory;
6+
import org.junit.BeforeClass;
57
import org.junit.Ignore;
68
import org.junit.Test;
79

810
import software.amazon.awssdk.services.s3.S3Client;
911

1012
public class N5AmazonS3MockTests extends N5AmazonS3Tests {
1113

14+
@BeforeClass
15+
public static void before() {
16+
17+
MockS3Factory.getOrCreateS3();
18+
assumeTrue("mock s3 server not running", MockS3Factory.isMinioServerRunning());
19+
}
20+
1221
@Override
1322
protected S3Client getS3() {
1423

src/test/java/org/janelia/saalfeldlab/n5/s3/mock/MockS3Factory.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ public static void startMinioServer() throws Exception {
7171
return;
7272
}
7373

74-
// TODO if the server fails to start for some reason
75-
// e.g. minio server not installed
76-
// probably should not fail, but report "mock test skipped" or something
7774
minioServerDirectory = createTmpServerDirectory();
7875
ProcessBuilder processBuilder = new ProcessBuilder("minio", "server", ".");
7976
processBuilder.directory(minioServerDirectory.toFile());
@@ -104,7 +101,7 @@ private static Path createTmpServerDirectory() throws IOException {
104101
return tempDirectory;
105102
}
106103

107-
private static boolean isMinioServerRunning() {
104+
public static boolean isMinioServerRunning() {
108105

109106
try {
110107
minioUri.toURL().openConnection().connect();

0 commit comments

Comments
 (0)