From 07906dd814d4d2c8b77fece21fd8013330450828 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Sat, 5 Sep 2026 14:03:50 +0200
Subject: [PATCH 1/3] test/system: Style fix

Fallout from 1318c9e9c9028cb91b1d94e0803d8d6e020f1563

https://github.com/containers/toolbox/pull/1840
---
 test/system/211-dbus.bats | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/system/211-dbus.bats b/test/system/211-dbus.bats
index 963d6f2ec..051793b7d 100644
--- a/test/system/211-dbus.bats
+++ b/test/system/211-dbus.bats
@@ -81,13 +81,11 @@ teardown_file() {
                          --object-path /org/freedesktop/DBus \
                          --method org.freedesktop.DBus.Peer.Ping)"
 
-  run --keep-empty-lines --separate-stderr "$TOOLBX" run \
-    --distro arch \
-    gdbus call \
-      --session \
-      --dest org.freedesktop.DBus \
-      --object-path /org/freedesktop/DBus \
-      --method org.freedesktop.DBus.Peer.Ping
+  run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro arch gdbus call \
+                                                                         --session \
+                                                                         --dest org.freedesktop.DBus \
+                                                                         --object-path /org/freedesktop/DBus \
+                                                                         --method org.freedesktop.DBus.Peer.Ping
 
   assert_success
   assert_line --index 0 "$expected_response"

From dbfbff638daa5338fb29e0eafd25c808ef4c3aa7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 8 Sep 2026 12:51:24 +0200
Subject: [PATCH 2/3] test/system: Remove unused variable

Fallout from 68d63bf09e7ea0e85cde4ab0c68cddc6cadcdbb1

https://github.com/containers/toolbox/pull/1840
---
 test/system/104-run.bats | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/system/104-run.bats b/test/system/104-run.bats
index 36353236d..713d1d6ba 100644
--- a/test/system/104-run.bats
+++ b/test/system/104-run.bats
@@ -289,9 +289,6 @@ teardown() {
   assert_success
   assert_output ""
 
-  local default_container_name
-  default_container_name="$(get_system_id)-toolbox-$(get_system_version)"
-
   create_default_container
   create_container other-container
 

From 586b88fb49fd3bbc7d83e5e76a8ca6c5d00ff0e7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 8 Sep 2026 13:22:56 +0200
Subject: [PATCH 3/3] test/system: Silence SC2154

Otherwise https://www.shellcheck.net/ would complain:
  Line 287:
  run echo "$name"
            ^---^ SC2154 (warning): name is referenced but not assigned.

See: https://www.shellcheck.net/wiki/SC2154

Note that there's no need to use Bats' 'run' helper to merely check if
the command succeeded or not, because 'set -e' is set for all tests [1].

[1] https://bats-core.readthedocs.io/en/stable/writing-tests.html

https://github.com/containers/toolbox/pull/1840
---
 test/system/104-run.bats | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/system/104-run.bats b/test/system/104-run.bats
index 713d1d6ba..dd45d4370 100644
--- a/test/system/104-run.bats
+++ b/test/system/104-run.bats
@@ -284,10 +284,7 @@ teardown() {
 }
 
 @test "run: Ensure that a specific container is used" {
-  run echo "$name"
-
-  assert_success
-  assert_output ""
+  test -z "${name+x}"
 
   create_default_container
   create_container other-container