Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

awscli: Remove test for empty directories lookup #242

Merged
merged 1 commit into from
Dec 18, 2017
Merged

awscli: Remove test for empty directories lookup #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 0 additions & 64 deletions run/core/awscli/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,69 +177,6 @@ function test_upload_object() {
return $rv
}

# Test lookup a directory prefix.
function test_lookup_object_prefix() {
# log start time
start_time=$(get_time)

function="make_bucket"
bucket_name=$(make_bucket)
rv=$?

# if make bucket succeeds create a directory.
if [ $rv -eq 0 ]; then
function="${AWS} s3api put-object --bucket ${bucket_name} --key prefix/directory/"
out=$($function 2>&1)
rv=$?
else
# if make_bucket fails, $bucket_name has the error output
out="${bucket_name}"
fi

# if directory create succeeds, upload the object.
if [ $rv -eq 0 ]; then
function="${AWS} s3api put-object --body ${MINT_DATA_DIR}/datafile-1-MB --bucket ${bucket_name} --key prefix/directory/datafile-1-MB"
# save the ref to function being tested, so it can be logged
test_function=${function}
out=$($function 2>&1)
rv=$?
fi

# if upload succeeds lookup for the prefix.
if [ $rv -eq 0 ]; then
function="${AWS} s3api head-object --bucket ${bucket_name} --key prefix/directory"
# save the ref to function being tested, so it can be logged
test_function=${function}
out=$($function 2>&1)
rv=$?
fi

# Request should fail.
if [ $rv -eq 0 ]; then
# clean up and log error
${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
return 1
fi

# Lookup for the right prefix.
function="${AWS} s3api head-object --bucket ${bucket_name} --key prefix/directory/"
# save the ref to function being tested, so it can be logged
test_function=${function}
out=$($function 2>&1)

rv=$?
if [ $rv -ne 0 ]; then
# clean up and log error
${AWS} s3 rb s3://"${bucket_name}" --force > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
else
log_success "$(get_duration "$start_time")" "${test_function}"
fi

return $rv
}

# Tests listing objects for both v1 and v2 API.
function test_list_objects() {
# log start time
Expand Down Expand Up @@ -887,7 +824,6 @@ main() {
# Success tests
test_create_bucket && \
test_upload_object && \
test_lookup_object_prefix && \
test_list_objects && \
test_multipart_upload && \
test_copy_object && \
Expand Down