Skip to content

Commit cca4103

Browse files
add a non-TLS test (#2005)
1 parent 9933690 commit cca4103

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ functional-test:
3232
@GO111MODULE=on go build -race functional_tests.go
3333
@SERVER_ENDPOINT=localhost:9000 ACCESS_KEY=minioadmin SECRET_KEY=minioadmin ENABLE_HTTPS=1 MINT_MODE=full ./functional_tests
3434

35+
functional-test-notls:
36+
@GO111MODULE=on go build -race functional_tests.go
37+
@SERVER_ENDPOINT=localhost:9000 ACCESS_KEY=minioadmin SECRET_KEY=minioadmin ENABLE_HTTPS=0 MINT_MODE=full ./functional_tests
38+
3539
clean:
3640
@echo "Cleaning up all the generated files"
3741
@find . -name '*.test' | xargs rm -fv

functional_tests.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -3565,16 +3565,10 @@ func validateObjectAttributeRequest(OA *minio.ObjectAttributes, opts *minio.Obje
35653565
}
35663566
}
35673567

3568-
hasFullObjectChecksum := true
3569-
if OA.Checksum.ChecksumCRC32 == "" {
3570-
if OA.Checksum.ChecksumCRC32C == "" {
3571-
if OA.Checksum.ChecksumSHA1 == "" {
3572-
if OA.Checksum.ChecksumSHA256 == "" {
3573-
hasFullObjectChecksum = false
3574-
}
3575-
}
3576-
}
3577-
}
3568+
hasFullObjectChecksum := (OA.Checksum.ChecksumCRC32 != "" ||
3569+
OA.Checksum.ChecksumCRC32C != "" ||
3570+
OA.Checksum.ChecksumSHA1 != "" ||
3571+
OA.Checksum.ChecksumSHA256 != "")
35783572

35793573
if test.HasFullChecksum {
35803574
if !hasFullObjectChecksum {

0 commit comments

Comments
 (0)