tests: add sbin to PATH so mkfs.ext4 works under Whonix

QubesOS · Feb 3, 2025 · ece1603 · ece1603
1 parent c1cdf38
commit ece1603
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/qubes/tests/integ/backup.py b/qubes/tests/integ/backup.py
@@ -720,6 +720,8 @@ def test_110_send_to_vm_no_space(self):
             self.loop.run_until_complete(self.backupvm.start())
             self.loop.run_until_complete(
                 self.backupvm.run_for_stdio(
+                    # add sbin in Debian/Whonix for mkfs.ext4
+                    "PATH=$PATH:/usr/sbin;"
                     # Debian 7 has too old losetup to handle loop-control device
                     "mknod /dev/loop0 b 7 0;"
                     "truncate -s 50M /home/user/backup.img && "

diff --git a/qubes/tests/integ/devices_block.py b/qubes/tests/integ/devices_block.py
@@ -81,6 +81,8 @@ def test_000_list_loop(self):
         if self.template is None:
             self.skipTest("loop devices excluded in dom0")
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "losetup -f {path}; "
@@ -106,6 +108,8 @@ def test_001_list_loop_mounted(self):
         if self.template is None:
             self.skipTest("loop devices excluded in dom0")
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "mkfs.ext4 -q -F {path}; "
@@ -128,6 +132,8 @@ def test_001_list_loop_mounted(self):
 
     def test_010_list_dm(self):
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "loopdev=`losetup -f`; "
@@ -158,6 +164,8 @@ def test_010_list_dm(self):
 
     def test_011_list_dm_mounted(self):
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "loopdev=`losetup -f`; "
@@ -192,6 +200,8 @@ def test_011_list_dm_mounted(self):
 
     def test_012_list_dm_delayed(self):
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "loopdev=`losetup -f`; "
@@ -227,6 +237,8 @@ def test_013_list_dm_removed(self):
                 "test not supported in dom0 - loop devices excluded " "in dom0"
             )
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "loopdev=`losetup -f`; "
@@ -257,6 +269,8 @@ def test_020_list_loop_partition(self):
         if self.template is None:
             self.skipTest("loop devices excluded in dom0")
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "echo ,,L | sfdisk {path};"
@@ -286,6 +300,8 @@ def test_021_list_loop_partition_mounted(self):
         if self.template is None:
             self.skipTest("loop devices excluded in dom0")
         self.run_script(
+            # add sbin in Debian/Whonix for mkfs.ext4
+            "PATH=$PATH:/usr/sbin;"
             "set -e;"
             "truncate -s 128M {path}; "
             "echo ,,L | sfdisk {path};"
@@ -345,6 +361,8 @@ def setUp(self):
             self.fail("Failed to start some VM: {!r}".format(exc))
         self.loop.run_until_complete(
             self.backend.run_for_stdio(
+                # add sbin in Debian/Whonix for mkfs.ext4
+                "PATH=$PATH:/usr/sbin;"
                 "set -e;"
                 "truncate -s 128M {path}; "
                 "losetup -f {path}; "