From 76eebb399de28641cb2b37d44518098e066b387a Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Tue, 19 Mar 2024 16:53:45 -0700
Subject: [PATCH] use assert_success

---
 test/include.bats      | 18 +++++++++---------
 test/mail-toaster.bats | 11 +++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/test/include.bats b/test/include.bats
index 7c55054a..a2c13927 100644
--- a/test/include.bats
+++ b/test/include.bats
@@ -6,45 +6,45 @@ setup() {
 
 @test "./include/djb.sh" {
   run ./include/djb.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/editor.sh" {
   run ./include/editor.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/mta.sh" {
   run ./include/mta.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/mysql.sh" {
   run ./include/mysql.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/nginx.sh" {
   run ./include/nginx.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/php.sh" {
   run ./include/php.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/shell.sh" {
   run ./include/shell.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/user.sh" {
   run ./include/user.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "./include/vpopmail.sh" {
   run ./include/vpopmail.sh
-  [ "$status" -eq 0 ]
+  assert_success
 }
diff --git a/test/mail-toaster.bats b/test/mail-toaster.bats
index 2cfe5946..16b5c311 100644
--- a/test/mail-toaster.bats
+++ b/test/mail-toaster.bats
@@ -8,21 +8,24 @@ setup() {
 
 @test "mt6_version_check" {
   run mt6_version_check
-  [ "$status" -eq 0 ]
+  #[ "$status" -eq 0 ]
+  assert_success
 }
 
 @test "safe_jailname replaces . with _" {
   run safe_jailname bad.chars
-  [ "$status" -eq 0 ]
-  [ "${lines[0]}" = "bad_chars" ]
+  assert_success
+  assert_output "bad_chars"
 }
 
 @test "reverse_list" {
   run reverse_list tic tac toe
+  #echo "# $output" >&3
+  assert_success
   assert_output --partial "toe tac tic"
 }
 
 @test "tell_status" {
   run tell_status "BATS testing"
-  [ "$status" -eq 0 ]
+  assert_success
 }