Skip to content

Commit

Permalink
Fix mc logging and exit on first failure
Browse files Browse the repository at this point in the history 
Fixes #154
  • Loading branch information
@nitisht
nitisht committed Sep 28, 2017
1 parent c02b969 commit e19299a
Showing 1 changed file with 29 additions and 21 deletions.
50 changes: 29 additions & 21 deletions run/core/mc/test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ function get_duration() {

function log_success() {
function=$(python -c 'import sys,json; print(json.dumps(sys.stdin.read()))' <<<"$2")
printf '{"name": "mc", "duration": "%d", "function": %s, "status": "PASS"}\n' "$1" "$function"
printf '{"name": "mc", "duration": %d, "function": %s, "status": "PASS"}\n' "$1" "$function"
}

function log_failure() {
function=$(python -c 'import sys,json; print(json.dumps(sys.stdin.read()))' <<<"$2")
printf '{"name": "mc", "duration": "%d", "function": %s, "status": "FAIL", "error": %s}\n' "$1" "$function" "$3"
printf '{"name": "mc", "duration": %d, "function": %s, "status": "FAIL", "error": "%s"}\n' "$1" "$function" "$3"
}

function log_alert() {
function=$(python -c 'import sys,json; print(json.dumps(sys.stdin.read()))' <<<"$2")
printf '{"name": "mc", "duration": "%d", "function": %s, "status": "FAIL", "alert": "%d", error": "%s"}\n' "$1" "$function" "$3" "$4"
printf '{"name": "mc", "duration": %d, "function": %s, "status": "FAIL", "alert": "%d", error": "%s"}\n' "$1" "$function" "$3" "$4"
}

function make_bucket() {
Expand Down Expand Up @@ -83,7 +83,8 @@ function test_make_bucket() {
start_time=$(get_time)

function="make_bucket"
bucket_name=$(make_bucket)
test_function=${function}
bucket_name=$(make_bucket)
rv=$?

# if make_bucket is successful remove the bucket
Expand All @@ -92,13 +93,14 @@ function test_make_bucket() {
out=$(delete_bucket "${bucket_name}")
rv=$?
else
# if make bucket failes, $bucket_name has the error output
# if make bucket fails, $bucket_name has the error output
out="${bucket_name}"
fi

if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${function}"
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -152,6 +154,7 @@ function test_put_object() {
if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -207,6 +210,7 @@ function test_put_object_multipart() {
if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -269,6 +273,7 @@ function test_presigned_upload_object() {
if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -328,6 +333,7 @@ function test_presigned_download_object() {
if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -359,7 +365,7 @@ function test_mirror_list_objects() {
fi

if [ $rv -eq 0 ]; then
if diff -bB <(ls "$MINT_DATA_DIR") <(./mc ls --json "${SERVER_ALIAS}/${bucket_name}" | jq -r .key); then
if diff -bB <(ls "$MINT_DATA_DIR" | sort) <(./mc ls --json "${SERVER_ALIAS}/${bucket_name}" | jq -r .key | sort) > /dev/null; then
function="delete_bucket"
out=$(delete_bucket "$bucket_name")
rv=$?
Expand All @@ -371,6 +377,7 @@ function test_mirror_list_objects() {
if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -422,6 +429,7 @@ function test_cat_objects() {
if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -472,11 +480,13 @@ function test_make_bucket_error() {

# execute the test
out=$($function 2>&1)
rv=$?
rv=$?

if [ $rv -eq 1 ]; then
log_success "$(get_duration "$start_time")" "${function}"
rv=0
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand Down Expand Up @@ -519,6 +529,7 @@ function test_put_object_error() {
if [ $rv -eq 0 ]; then
log_success "$(get_duration "$start_time")" "${test_function}"
else
${MC_CMD} rm --force --recursive ${SERVER_ALIAS}/"${bucket_name}" > /dev/null 2>&1
log_failure "$(get_duration "$start_time")" "${function}" "${out}"
fi

Expand All @@ -528,20 +539,17 @@ function test_put_object_error() {
# main handler for all the tests.
function main() {

# Success tests
test_make_bucket
test_put_object
test_put_object_multipart
test_presigned_upload_object
test_presigned_download_object
test_mirror_list_objects
test_cat_objects

# TODO Add Policy tests once supported on GCS

# Negative tests
test_make_bucket_error
test_make_bucket && \
test_put_object && \
test_put_object_multipart && \
test_presigned_upload_object && \
test_presigned_download_object && \
test_mirror_list_objects && \
test_cat_objects && \
test_make_bucket_error && \
test_put_object_error

return $?
}

main

0 comments on commit e19299a

Please sign in to comment.