tests(integration): move most test inside groups.

tests/integration/apparmor/aa-enforce.bats

@@ -3,10 +3,9 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 setup_file() {
-    aa_setup
     skip
 }
 

tests/integration/apparmor/aa-status.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "aa-status: Check status" {
     sudo aa-status

tests/integration/gpg/gpgconf.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "gpgconf: List all components" {
     gpgconf --list-components

tests/integration/procps/ps.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "ps: List all running processes" {
     ps aux

tests/integration/procps/sysctl.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "sysctl: Show all available variables and their values" {
     sysctl -a
@@ -24,4 +24,3 @@ load common
 @test "sysctl: Apply changes from `/etc/sysctl.conf`" {
     sysctl -p
 }
-

tests/integration/procps/w.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "w: Display information about all users who are currently logged in" {
     w
@@ -12,3 +12,8 @@ load common
 @test "w: Display information about a specific user" {
     w root
 }
+
+@test "w: Display information without including the header, the login, JCPU and PCPU columns" {
+    w --no-header
+    w --short
+}

tests/integration/shadow/groupadd.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "groupadd: Create a new group" {
     sudo groupadd user2

tests/integration/shadow/groups.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "groups: Print group memberships for the current user" {
     groups

tests/integration/systemd/homectl.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 setup_file() {
     sudo systemctl start systemd-homed

tests/integration/systemd/hostnamectl.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "hostnamectl: Get the hostname of the computer" {
     hostnamectl

tests/integration/systemd/systemd-ac-power.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "systemd-ac-power: Report whether we are connected to an external power source." {
     systemd-ac-power || true

tests/integration/systemd/systemd-analyze.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "systemd-analyze: List all running units, ordered by the time they took to initialize" {
     systemd-analyze --no-pager blame
@@ -16,5 +16,3 @@ load common
 @test "systemd-analyze: Show security scores of running units" {
     systemd-analyze --no-pager security
 }
-
-

tests/integration/systemd/systemd-cat.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "systemd-cat: Write the output of the specified command to the journal (both output streams are captured)" {
     systemd-cat pwd

tests/integration/systemd/systemd-cgls.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "systemd-cgls: Display the whole control group hierarchy on your system" {
     systemd-cgls --no-pager
@@ -16,4 +16,3 @@ load common
 @test "systemd-cgls: Display the control group hierarchy of one or more systemd units" {
     systemd-cgls --no-pager --unit systemd-logind
 }
-

tests/integration/systemd/systemd-detect-virt.bats

@@ -3,23 +3,20 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "systemd-detect-virt: List detectable virtualization technologies" {
     systemd-detect-virt --list
 }
 
-# bats test_tags=systemd-detect-virt
 @test "systemd-detect-virt: Detect virtualization, print the result and return a zero status code when running in a VM or a container, and a non-zero code otherwise" {
     systemd-detect-virt || true
 }
 
-# bats test_tags=systemd-detect-virt
 @test "systemd-detect-virt: Silently check without printing anything" {
     systemd-detect-virt --quiet || true
 }
 
-# bats test_tags=systemd-detect-virt
 @test "systemd-detect-virt: Only detect hardware virtualization" {
     systemd-detect-virt --vm || true
 }

tests/integration/systemd/systemd-id128.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "systemd-id128: Generate a new random identifier" {
     systemd-id128 new

tests/integration/systemd/systemd-sysusers.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "systemd-sysusers: Print the contents of all configuration files (before each file, its name is printed as a comment)" {
     systemd-sysusers --cat-config

tests/integration/systemd/userdbctl.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "userdbctl: List all known user records" {
     userdbctl --no-pager user

tests/integration/usb/lsusb.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "lsusb: List all the USB devices available" {
     lsusb || true

tests/integration/utils/blkid.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "blkid: List all partitions" {
     sudo blkid

tests/integration/utils/chsh.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "chsh: list available shells" {
     chsh --list-shells || true

tests/integration/utils/df.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "df: Display all filesystems and their disk usage" {
     df

tests/integration/utils/dmesg.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "dmesg: Show kernel messages" {
     sudo dmesg

tests/integration/utils/lsblk.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "lsblk: List all storage devices in a tree-like format" {
     lsblk

tests/integration/utils/lscpu.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "lscpu: Display information about all CPUs" {
     lscpu

tests/integration/utils/lspci.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "lspci: Show a brief list of devices" {
     lspci

tests/integration/utils/pstree.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "pstree: Display a tree of processes" {
     pstree

tests/integration/utils/sync.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "sync: Flush all pending write operations on all disks" {
     sync

tests/integration/utils/users.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "users: Print logged in usernames" {
     users

tests/integration/utils/uuidd.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "uuidd: Generate a random UUID" {
     uuidd --random

tests/integration/utils/uuidgen.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "uuidgen: Create a random UUIDv4" {
     uuidgen --random

tests/integration/utils/who.bats

@@ -3,7 +3,7 @@
 # Copyright (C) 2024 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-load common
+load ../common
 
 @test "who: Display the username, line, and time of all currently logged-in sessions" {
     who