From bc067f12d6d11150f20083313156e2490eec6076 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 13 Jun 2023 12:19:25 +0200
Subject: [PATCH] test/system: Simplify the line count checks by relying on
 Bats >= 1.7.0

Commit e22a82fec8e59c5a already added a dependency on Bats >= 1.7.0,
which is present on Fedora >= 36.  Therefore, it should be exploited
wherever possible to simplify things.

Earlier, when the line counts were checked only with Bats >= 1.7.0,
there was a need to separately check the whole standard error and
output streams with 'assert_output' for the tests to be useful on
Fedora 35, which only had Bats 1.5.0.  Now that the line counts are
being checked unconditionally, there's no need for that anymore.

Note that bats_require_minimum_version itself is only available from
Bats 1.7.0 [1].

[1] Bats commit 71d6b71cebc3d32b
    https://github.com/bats-core/bats-core/issues/556
    https://bats-core.readthedocs.io/en/stable/warnings/BW02.html

https://github.com/containers/toolbox/pull/1314
---
 test/system/107-rmi.bats | 91 ++++++++++------------------------------
 1 file changed, 21 insertions(+), 70 deletions(-)

diff --git a/test/system/107-rmi.bats b/test/system/107-rmi.bats
index b73c7ed..e2429cc 100644
--- a/test/system/107-rmi.bats
+++ b/test/system/107-rmi.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.7.0
   _setup_environment
   cleanup_all
 }
@@ -37,13 +38,8 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi --all
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0
@@ -81,13 +77,8 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0
@@ -106,13 +97,8 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi --all
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0
@@ -131,13 +117,8 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$image"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0
@@ -159,24 +140,14 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image-copy"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0
@@ -198,24 +169,14 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image-copy"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0
@@ -237,13 +198,8 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image" "$default_image-copy"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0
@@ -265,13 +221,8 @@ teardown() {
   run --keep-empty-lines --separate-stderr "$TOOLBOX" rmi "$default_image-copy" "$default_image"
 
   assert_success
-  assert_output ""
-  output="$stderr"
-  assert_output ""
-  if check_bats_version 1.7.0; then
-    assert [ ${#lines[@]} -eq 0 ]
-    assert [ ${#stderr_lines[@]} -eq 0 ]
-  fi
+  assert [ ${#lines[@]} -eq 0 ]
+  assert [ ${#stderr_lines[@]} -eq 0 ]
 
   num_of_images="$(list_images)"
   assert_equal "$num_of_images" 0