From e71c0579faa881ac32f780dc6653f345ebe4494b Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 30 Nov 2023 16:46:38 +0100
Subject: [PATCH] test/system: Simplify code

There's no need to run these cat(1) and gdbus(1) invocations through a
shell (ie., 'sh -c'), because there's no shell expansion that needs to
be performed.

These are unlike cases where shell expansion does need to be performed.
eg., 'readlink /proc/$$/ns/user', where the $$ needs to be expanded.

Fallout from 58134f84970e2b3a9d9ecde4b43ae41d4c401edb and
a0514cba12a1d435d86249bc37b2ee44f045cf07
---
 test/system/206-user.bats | 28 ++++++++++++++--------------
 test/system/211-dbus.bats | 22 +++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/test/system/206-user.bats b/test/system/206-user.bats
index fdb2a33da..57d086d8f 100644
--- a/test/system/206-user.bats
+++ b/test/system/206-user.bats
@@ -182,7 +182,7 @@ teardown() {
 
   create_default_container
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run sh -c 'cat /etc/passwd'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run cat /etc/passwd
 
   assert_success
   assert_line --regexp "^$USER::$user_id_real:$user_id_real:$user_gecos:$HOME:$SHELL$"
@@ -201,7 +201,7 @@ teardown() {
 
   create_distro_container arch latest arch-toolbox-latest
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch sh -c 'cat /etc/passwd'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch cat /etc/passwd
 
   assert_success
   assert_line --regexp "^$USER::$user_id_real:$user_id_real:$user_gecos:$HOME:$SHELL$"
@@ -220,7 +220,7 @@ teardown() {
 
   create_distro_container fedora 34 fedora-toolbox-34
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 sh -c 'cat /etc/passwd'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 cat /etc/passwd
 
   assert_success
   assert_line --regexp "^$USER::$user_id_real:$user_id_real:$user_gecos:$HOME:$SHELL$"
@@ -239,7 +239,7 @@ teardown() {
 
   create_distro_container rhel 8.7 rhel-toolbox-8.7
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 sh -c 'cat /etc/passwd'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 cat /etc/passwd
 
   assert_success
   assert_line --regexp "^$USER::$user_id_real:$user_id_real:$user_gecos:$HOME:$SHELL$"
@@ -258,7 +258,7 @@ teardown() {
 
   create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 sh -c 'cat /etc/passwd'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 cat /etc/passwd
 
   assert_success
   assert_line --regexp "^$USER::$user_id_real:$user_id_real:$user_gecos:$HOME:$SHELL$"
@@ -277,7 +277,7 @@ teardown() {
 
   create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 sh -c 'cat /etc/passwd'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 cat /etc/passwd
 
   assert_success
   assert_line --regexp "^$USER::$user_id_real:$user_id_real:$user_gecos:$HOME:$SHELL$"
@@ -296,7 +296,7 @@ teardown() {
 
   create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 sh -c 'cat /etc/passwd'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 cat /etc/passwd
 
   assert_success
   assert_line --regexp "^$USER::$user_id_real:$user_id_real:$user_gecos:$HOME:$SHELL$"
@@ -431,7 +431,7 @@ teardown() {
 @test "user: $USER in group(5) inside the default container" {
   create_default_container
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run sh -c 'cat /etc/group'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run cat /etc/group
 
   assert_success
   assert_line --regexp "^(sudo|wheel):x:[[:digit:]]+:$USER$"
@@ -444,7 +444,7 @@ teardown() {
 @test "user: $USER in group(5) inside Arch Linux" {
   create_distro_container arch latest arch-toolbox-latest
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch sh -c 'cat /etc/group'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch cat /etc/group
 
   assert_success
   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
@@ -457,7 +457,7 @@ teardown() {
 @test "user: $USER in group(5) inside Fedora 34" {
   create_distro_container fedora 34 fedora-toolbox-34
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 sh -c 'cat /etc/group'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 cat /etc/group
 
   assert_success
   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
@@ -470,7 +470,7 @@ teardown() {
 @test "user: $USER in group(5) inside RHEL 8.7" {
   create_distro_container rhel 8.7 rhel-toolbox-8.7
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 sh -c 'cat /etc/group'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 cat /etc/group
 
   assert_success
   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
@@ -483,7 +483,7 @@ teardown() {
 @test "user: $USER in group(5) inside Ubuntu 16.04" {
   create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 sh -c 'cat /etc/group'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 cat /etc/group
 
   assert_success
   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
@@ -496,7 +496,7 @@ teardown() {
 @test "user: $USER in group(5) inside Ubuntu 18.04" {
   create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 sh -c 'cat /etc/group'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 cat /etc/group
 
   assert_success
   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
@@ -509,7 +509,7 @@ teardown() {
 @test "user: $USER in group(5) inside Ubuntu 20.04" {
   create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 sh -c 'cat /etc/group'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 cat /etc/group
 
   assert_success
   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
diff --git a/test/system/211-dbus.bats b/test/system/211-dbus.bats
index 2c15a2c16..8c238f1e3 100644
--- a/test/system/211-dbus.bats
+++ b/test/system/211-dbus.bats
@@ -39,11 +39,11 @@ teardown() {
 
   create_default_container
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run sh -c 'gdbus call \
-                                                                   --session \
-                                                                   --dest org.freedesktop.DBus \
-                                                                   --object-path /org/freedesktop/DBus \
-                                                                   --method org.freedesktop.DBus.Peer.Ping'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run 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"
@@ -68,12 +68,12 @@ teardown() {
 
   create_default_container
 
-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run sh -c 'gdbus call \
-                                                                   --system \
-                                                                   --dest org.freedesktop.systemd1 \
-                                                                   --object-path /org/freedesktop/systemd1 \
-                                                                   --method org.freedesktop.DBus.Properties.Get \
-                                                                     org.freedesktop.systemd1.Manager Version'
+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run gdbus call \
+                                                            --system \
+                                                            --dest org.freedesktop.systemd1 \
+                                                            --object-path /org/freedesktop/systemd1 \
+                                                            --method org.freedesktop.DBus.Properties.Get \
+                                                              org.freedesktop.systemd1.Manager Version
 
   assert_success
   assert_line --index 0 "$expected_response"