Skip to content

Commit 6ff18de

Browse files
authored
fix CORS configuration comparison (#1707)
Signed-off-by: Bala.FA <bala@minio.io>
1 parent 1fb4c5b commit 6ff18de

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

functional/TestArgs.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public TestArgs(String endpoint, String accessKey, String secretKey, String regi
128128
String kmsKeyName = "my-minio-key";
129129
if (endpoint == null) {
130130
this.endpoint = "http://localhost:9000";
131-
this.endpointTLS = "https://localhost:9001";
131+
this.endpointTLS = "https://localhost:10000";
132132
this.accessKey = "minio";
133133
this.secretKey = "minio123";
134134
this.region = "us-east-1";
@@ -345,7 +345,7 @@ public static void handleException(String methodName, String args, long startTim
345345
}
346346

347347
public static boolean downloadMinioServer() throws IOException {
348-
String url = "https://dl.min.io/server/minio/release/";
348+
String url = "https://dl.min.io/aistor/minio/release/";
349349
if (OS.contains("linux")) {
350350
url += "linux-amd64/minio";
351351
} else if (OS.contains("windows")) {
@@ -388,13 +388,17 @@ public static Process runMinioServer(boolean tls) throws Exception {
388388
new ProcessBuilder(
389389
binaryPath.getPath(),
390390
"server",
391+
"--license",
392+
"minio.license",
391393
"--address",
392-
":9001",
394+
":10000",
393395
"--certs-dir",
394396
".cfg/certs",
395397
".d{1...4}");
396398
} else {
397-
pb = new ProcessBuilder(binaryPath.getPath(), "server", ".d{1...4}");
399+
pb =
400+
new ProcessBuilder(
401+
binaryPath.getPath(), "server", "--license", "minio.license", ".d{1...4}");
398402
}
399403

400404
Map<String, String> env = pb.environment();

functional/TestMinioClient.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2969,7 +2969,9 @@ public void testBucketCors(String methodName, boolean getTest, boolean deleteTes
29692969
CORSConfiguration config =
29702970
client.getBucketCors(GetBucketCorsArgs.builder().bucket(bucketName).build());
29712971
Assertions.assertEquals(
2972-
expectedConfig, config, "cors: expected: " + expectedConfig + ", got: " + config);
2972+
expectedConfig.toString(),
2973+
config.toString(),
2974+
"cors: expected: " + expectedConfig.toString() + ", got: " + config.toString());
29732975
}
29742976
if (deleteTest) {
29752977
client.deleteBucketCors(DeleteBucketCorsArgs.builder().bucket(bucketName).build());

functional/minio.license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJhaWQiOjAsImNhcCI6MCwiaWF0IjoxLjc4MDAzMTY0NTUyMzA5ODM1OGU5LCJpc3MiOiJzdWJuZXRAbWluLmlvIiwibGlkIjoiYjNhYTliNGQtOTUxYy00MjIzLTgyMmEtZGY2NjE5MDNjOWFkIiwibm9kZXMiOjEsIm9yZyI6IiIsInBsYW4iOiJGUkVFIiwicHJvZHVjdCI6IkFJU3RvciIsInN1YiI6ImRldkBtaW5pby5pbyIsInRyaWFsIjpmYWxzZX0.Aq0kaFgd5SMHYEK7fIYzPsU4xlS119sj-BSyftCDpmtHIbW6KNFXGA9nbKPc17ZXKgcQgUoaPncsq30EOy7PyH-lp3LPpy3rPoD7ptJHI2v0jqpvlnP0cVGK0Yuw3vib

0 commit comments

Comments
 (0)