MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix mint tests in awscli to ignore NotImplemented properly (#9561)

This commit is contained in:
Harshavardhana 2020-05-08 22:32:10 -07:00 committed by GitHub
parent 6d76efb9bb
commit 36e88cbd50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mint/run/core/aws-sdk-php/composer.json
View File

@ -1,6 +1,6 @@
{ {
"require": { "require": {
"aws/aws-sdk-php": "^3.30", "aws/aws-sdk-php": "^3.30",
"GuzzleHttp/Psr7": "^1.4" "guzzlehttp/psr7": "^1.4"
} }
} }

37
mint/run/core/awscli/test.sh
View File

@ -671,7 +671,7 @@ function test_copy_object_storage_class() {
rv=$? rv=$?
# if this functionality is not implemented return right away. # if this functionality is not implemented return right away.
if [ $rv -ne 0 ]; then if [ $rv -ne 0 ]; then
if echo "$out" | greq -q "NotImplemented"; then if echo "$out" | grep -q "NotImplemented"; then
${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1 ${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1
return 0 return 0
fi fi
@ -741,7 +741,7 @@ function test_copy_object_storage_class_same() {
rv=$? rv=$?
# if this functionality is not implemented return right away. # if this functionality is not implemented return right away.
if [ $rv -ne 0 ]; then if [ $rv -ne 0 ]; then
if echo "$out" | greq -q "NotImplemented"; then if echo "$out" | grep -q "NotImplemented"; then
${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1 ${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1
return 0 return 0
fi fi
@ -1523,15 +1523,34 @@ function test_worm_bucket() {
# log start time # log start time
start_time=$(get_time) start_time=$(get_time)
function="make_bucket" # Make bucket
bucket_name=$(make_bucket) bucket_name="awscli-mint-test-bucket-$RANDOM"
function="${AWS} s3api create-bucket --bucket ${bucket_name} --object-lock-enabled-for-bucket"
# execute the test
out=$($function 2>&1)
rv=$? rv=$?
if [ $rv -ne 0 ]; then
# if this functionality is not implemented return right away.
if echo "$out" | grep -q "NotImplemented"; then
${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1
return 0
fi
fi
# if make bucket succeeds set object lock configuration # if make bucket succeeds set object lock configuration
if [ $rv -eq 0 ]; then if [ $rv -eq 0 ]; then
args=( s3api put-object-lock-configuration --bucket "${bucket_name}" --object-lock-configuration 'ObjectLockEnabled="Enabled",Rule={DefaultRetention={Mode="GOVERNANCE",Days=1}}' ) function="${AWS} s3api put-object-lock-configuration --bucket ${bucket_name} --object-lock-configuration ObjectLockEnabled=Enabled"
out=$("${AWS}" "${args[@]}" 2>&1) out=$($function 2>&1)
rv=$? rv=$?
if [ $rv -ne 0 ]; then
# if this functionality is not implemented return right away.
if echo "$out" | grep -q "NotImplemented"; then
${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1
return 0
fi
fi
else else
# if make bucket fails, $bucket_name has the error output # if make bucket fails, $bucket_name has the error output
out="${bucket_name}" out="${bucket_name}"
@ -1556,13 +1575,11 @@ function test_worm_bucket() {
out="First time object upload failed" out="First time object upload failed"
fi fi
if [ $rv -ne 0 ]; then if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}" log_success "$(get_duration "$start_time")" "${test_function}"
rv=0
else else
# cleanup is not possible due to one day validity of object lock configurataion # cleanup is not possible due to one day validity of object lock configurataion
log_failure "$(get_duration "$start_time")" "${function}" "${out}" log_failure "$(get_duration "$start_time")" "${function}" "${out}"
rv=-1
fi fi
return $rv return $rv
@ -1583,7 +1600,7 @@ function test_legal_hold() {
if [ $rv -ne 0 ]; then if [ $rv -ne 0 ]; then
# if this functionality is not implemented return right away. # if this functionality is not implemented return right away.
if echo "$out" | greq -q "NotImplemented"; then if echo "$out" | grep -q "NotImplemented"; then
${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1 ${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1
return 0 return 0
fi fi