From fdcf1d890d17f50773ea9774def0145f6a829f6e Mon Sep 17 00:00:00 2001
From: ykim-1 <ykim@akamai.com>
Date: Thu, 2 Nov 2023 15:43:11 -0700
Subject: [PATCH 1/2] fix test.yml

---
 .github/workflows/test.yml | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2ed589ca5..fdf290e1d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    env:
+      EXIT_STATUS: 0
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
@@ -49,28 +51,31 @@ jobs:
       - name: Install go-junit-report
         run: go install github.com/jstemmer/go-junit-report/v2@latest
 
-      - name: Run tests and save json report
+      - name: Run tests and save test report
         run: |
           timestamp=$(date +'%Y%m%d%H%M')
-          report_filename="${timestamp}_linodego_test_report.json"
+          report_filename="${timestamp}_linodego_test_report.log"
 
-          make test ARGS="-json" | tee "$report_filename"
+          if ! make ARGS="2>&1" testacc > "$report_filename"; then
+            echo "EXIT_STATUS=1" >> $GITHUB_ENV
+          fi
+          cat "$report_filename"
         env:
           SKIP_LINT: 1
 
-      - name: Convert JSON Report to XML
+      - name: Convert to XML Report
         if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         run: |
-          filename=$(ls | grep -E '^[0-9]{12}_linodego_test_report\.json')
+          filename=$(ls | grep -E '^[0-9]{12}_linodego_test_report\.log')
 
           if [ -f "$filename" ]; then
             go_junit_report_dir=$(go env GOPATH)/bin
             export PATH="$PATH:$go_junit_report_dir"
-            xml_filename=$(echo "$filename" | sed 's/\.json$/.xml/')
+            xml_filename=$(echo "$filename" | sed 's/\.log/.xml/')
             go-junit-report < "$filename" > "$xml_filename"
-            echo "Conversion from JSON to XML completed successfully."
+            echo "Conversion from log to XML completed successfully."
           else
-            echo "JSON test report file not found."
+            echo "test report file not found."
             exit 1
           fi
         env:
@@ -94,3 +99,12 @@ jobs:
         run: |
           report_filename=$(ls | grep -E '^[0-9]{12}_linodego_test_report\.xml$')
           python3 scripts/test_report_upload_script.py "${report_filename}"
+
+      - name: Test Execution Status Handler
+        run: |
+          if [[ "$EXIT_STATUS" != 0 ]]; then
+            echo "Test execution contains failure(s)"
+            exit $EXIT_STATUS 
+          else
+            echo "Tests passed!"
+          fi
\ No newline at end of file

From cb128e061f32a038da1d456e7c3d36088457cb76 Mon Sep 17 00:00:00 2001
From: ykim-1 <ykim@akamai.com>
Date: Thu, 2 Nov 2023 15:47:42 -0700
Subject: [PATCH 2/2] update go-junit-report command in test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fdf290e1d..e90cfd9b9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -72,7 +72,7 @@ jobs:
             go_junit_report_dir=$(go env GOPATH)/bin
             export PATH="$PATH:$go_junit_report_dir"
             xml_filename=$(echo "$filename" | sed 's/\.log/.xml/')
-            go-junit-report < "$filename" > "$xml_filename"
+            go-junit-report -in "$filename" -iocopy -out "$xml_filename"
             echo "Conversion from log to XML completed successfully."
           else
             echo "test report file not found."