1 files changed, 7 insertions, 3 deletions
diff --git a/tools/hooks/post_test_hook.sh b/tools/hooks/post_test_hook.sh
index 72237a1e26..5f72eb378d 100755
--- a/tools/hooks/post_test_hook.sh
+++ b/tools/hooks/post_test_hook.sh
@@ -6,9 +6,13 @@ function archive_deleted_rows {
     # NOTE(danms): Run this a few times to make sure that we end
     # up with nothing more to archive
     for i in `seq 30`; do
-        out=$($MANAGE db archive_deleted_rows --verbose --max_rows 1000)
-        echo $?
-        if [[ $out =~ "Nothing was archived" ]]; then
+        $MANAGE db archive_deleted_rows --verbose --max_rows 1000
+        RET=$?
+        if [[ $RET -gt 1 ]]; then
+            echo Archiving failed with result $RET
+            return $RET
+        elif [[ $RET -eq 0 ]]; then
+            echo Archiving Complete
             break;
         fi
     done