Bash: fix errecho for multiple services (awsdocs#5345)

fixes for errecho general test fix
DavidSouther · Sep 5, 2023 · e8c743a · e8c743a
1 parent dec41fb
commit e8c743a
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/aws-cli/bash-linux/ec2/change-ec2-instance-type/awsdocs_general.sh b/aws-cli/bash-linux/ec2/change-ec2-instance-type/awsdocs_general.sh
@@ -90,7 +90,7 @@ function test_failed {
 # This function outputs everything sent to it to STDERR (standard error output).
 ###############################################################################
 function errecho {
-    printf "%b\n" "$*" 2>&1
+    printf "%b\n" "$*" 1>&2
 }
 
 ###############################################################################

diff --git a/aws-cli/bash-linux/iam/awsdocs_general.sh b/aws-cli/bash-linux/iam/awsdocs_general.sh
@@ -35,7 +35,7 @@ VERBOSE=false
 # This function outputs everything sent to it to STDERR (standard error output).
 ###############################################################################
 function errecho() {
-  printf "%s\n" "$*" 2>&1
+  printf "%s\n" "$*" 1>&2
 }
 # snippet-end:[aws-cli.bash-linux.iam.errecho]
 

diff --git a/aws-cli/bash-linux/iam/tests/test_general.sh → ...cli/bash-linux/iam/tests/include_tests.sh b/aws-cli/bash-linux/iam/tests/test_general.sh → ...cli/bash-linux/iam/tests/include_tests.sh
@@ -48,7 +48,7 @@ function run_test() {
 
   # Check to see if we got the expected error code.
   if [[ "$expected_err_code" -ne "$err" ]]; then
-    test_failed "The test \"$description\" returned an unexpected error code: $err"
+    test_failed "The test \"$description\" returned an unexpected error code: $err. $test_command_response"
   fi
 
   # Check the error message, if we provided other than "".

diff --git a/aws-cli/bash-linux/iam/tests/test_iam_examples.sh b/aws-cli/bash-linux/iam/tests/test_iam_examples.sh
@@ -30,7 +30,7 @@ function main() {
   # bashsupport disable=BP2001
   export VERBOSE=false
 
-  source ./test_general.sh
+  source ./include_tests.sh
   {
     local current_directory
     current_directory=$(pwd)

diff --git a/aws-cli/bash-linux/medical-imaging/awsdocs_general.sh b/aws-cli/bash-linux/medical-imaging/awsdocs_general.sh
@@ -35,7 +35,7 @@ VERBOSE=false
 # This function outputs everything sent to it to STDERR (standard error output).
 ###############################################################################
 function errecho() {
-  printf "%s\n" "$*" 2>&1
+  printf "%s\n" "$*" 1>&2
 }
 # snippet-end:[aws-cli.bash-linux.medical-imaging.errecho]
 

diff --git a/...nux/medical-imaging/tests/test_general.sh → ...ux/medical-imaging/tests/include_tests.sh b/...nux/medical-imaging/tests/test_general.sh → ...ux/medical-imaging/tests/include_tests.sh
@@ -48,7 +48,7 @@ function run_test() {
 
   # Check to see if we got the expected error code.
   if [[ "$expected_err_code" -ne "$err" ]]; then
-    test_failed "The test \"$description\" returned an unexpected error code: $err"
+    test_failed "The test \"$description\" returned an unexpected error code: $err. $test_command_response"
   fi
 
   # Check the error message, if we provided other than "".

diff --git a/aws-cli/bash-linux/medical-imaging/tests/test_medical_imaging_examples.sh b/aws-cli/bash-linux/medical-imaging/tests/test_medical_imaging_examples.sh
@@ -29,7 +29,7 @@ export INTERACTIVE=false
 # bashsupport disable=BP2001
 export VERBOSE=false
 
-  source ./test_general.sh
+  source ./include_tests.sh
   {
     local current_directory
     current_directory=$(pwd)

diff --git a/aws-cli/bash-linux/run_tests.sh b/aws-cli/bash-linux/run_tests.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+base_dir=$(pwd)
+
+echo "Running tests for S3 Bucket Lifecycle Operations"
+cd s3/bucket-lifecycle-operations/
+./test_bucket_operations.sh
+cd $base_dir
+
+echo "Running IAM tests"
+cd iam/tests
+./test_iam_examples.sh
+cd $base_dir
+
+echo "Running medical-imaging tests"
+cd medical-imaging/tests
+./test_medical_imaging_examples.sh
+cd $base_dir
+
+echo "Done"
diff --git a/aws-cli/bash-linux/s3/bucket-lifecycle-operations/awsdocs_general.sh b/aws-cli/bash-linux/s3/bucket-lifecycle-operations/awsdocs_general.sh
@@ -53,7 +53,7 @@ function run_test() {
 
   # Check to see if we got the expected error code.
   if [[ "$expected_err_code" -ne "$err" ]]; then
-    test_failed "The test \"$description\" returned an unexpected error code: $err"
+    test_failed "The test \"$description\" returned an unexpected error code: $err. $test_command_response"
   fi
 
   # Check the error message, if we provided other than "".
@@ -101,7 +101,7 @@ function test_failed() {
 # This function outputs everything sent to it to STDERR (standard error output).
 ###############################################################################
 function errecho() {
-  printf "%s\n" "$*" 2>&1
+  printf "%s\n" "$*" 1>&2
 }
 # snippet-end:[aws-cli.bash-linux.s3.errecho]