tests: cleanup the basic structure of integration tests.

roddhjav · Nov 19, 2024 · 5c70c50 · 5c70c50
1 parent 206bc34
commit 5c70c50
Show file tree

Hide file tree

Showing 45 changed files with 49 additions and 501 deletions.
diff --git a/tests/bats/aa-enforce.bats b/tests/bats/aa-enforce.bats
@@ -10,26  10,18 @@ setup_file() {
     skip
 }
 
-# bats test_tags=aa-enforce
 @test "aa-enforce: Disable profile" {
     sudo aa-disable pass
-    aa_check
 }
 
-# bats test_tags=aa-enforce
 @test "aa-enforce: Enforce a profile" {
     sudo aa-enforce pass
-    aa_check
 }
 
-# bats test_tags=aa-enforce
 @test "aa-enforce: Complain a profile" {
     sudo aa-complain pass
-    aa_check
 }
 
-# bats test_tags=aa-enforce
 @test "aa-enforce: Audit a profile" {
     sudo aa-audit pass
-    aa_check
 }
diff --git a/tests/bats/aa-status.bats b/tests/bats/aa-status.bats
@@ -5,36  5,22 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=aa-status
 @test "aa-status: Check status" {
     sudo aa-status
-    aa_check
 }
 
-# bats test_tags=aa-status
 @test "aa-status: Display the number of loaded policies" {
     sudo aa-status --profiled
-    aa_check
 }
 
-# bats test_tags=aa-status
 @test "aa-status: Display the number of loaded enforicing policies" {
     sudo aa-status --enforced
-    aa_check
 }
 
-# bats test_tags=aa-status
 @test "aa-status: Display the number of loaded non-enforcing policies" {
     sudo aa-status --complaining
-    aa_check
 }
 
-# bats test_tags=aa-status
 @test "aa-status: Display the number of loaded enforcing policies that kill tasks" {
     sudo aa-status --kill
-    aa_check
 }
diff --git a/tests/bats/blkid.bats b/tests/bats/blkid.bats
@@ -5,18  5,10 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=blkid
 @test "blkid: List all partitions" {
     sudo blkid
-    aa_check
 }
 
-# bats test_tags=blkid
 @test "blkid: List all partitions in a table, including current mountpoints" {
     sudo blkid -o list
-    aa_check
 }
diff --git a/tests/bats/chsh.bats b/tests/bats/chsh.bats
@@ -5,24  5,15 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=chsh
 @test "chsh: [l]ist available shells" {
     chsh --list-shells || true
-    aa_check
 }
 
-# bats test_tags=chsh
 @test "chsh: Set a specific login [s]hell for the current user" {
     echo "$PASSWORD" | chsh --shell /usr/bin/bash
-    aa_check
 }
 
 # bats test_tags=chsh
 @test "chsh: Set a login [s]hell for a specific user" {
     sudo chsh --shell /usr/bin/sh root
-    aa_check
 }
diff --git a/tests/bats/common.bash b/tests/bats/common.bash
@@ -105,8  105,18 @@ aa_check() {
     now=$(date  %s)
     duration=$((now - _START   1))
     logs=$(aa-log --raw --systemd --since "-${duration}s")
     aa_start
     if [[ -n "$logs" ]]; then
         fail "profile $PROGRAM raised logs: $logs"
     fi
-    aa_start
 }
 
 # Bats setup and teardown hooks
 
 setup_file() {
     aa_setup
 }
 
 teardown() {
 	aa_check
 }
diff --git a/tests/bats/cpuid.bats b/tests/bats/cpuid.bats
@@ -5,24  5,14 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=cpuid
 @test "cpuid: Display information for all CPUs" {
     cpuid
-    aa_check
 }
 
-# bats test_tags=cpuid
 @test "cpuid: Display information only for the current CPU" {
     cpuid -1
-    aa_check
 }
 
-# bats test_tags=cpuid
 @test "cpuid: Display raw hex information with no decoding" {
     cpuid -r
-    aa_check
 }
diff --git a/tests/bats/df.bats b/tests/bats/df.bats
@@ -5,36  5,22 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=df
 @test "df: Display all filesystems and their disk usage" {
     df
-    aa_check
 }
 
-# bats test_tags=df
 @test "df: Display all filesystems and their disk usage in human-readable form" {
     df -h
-    aa_check
 }
 
-# bats test_tags=df
 @test "df: Display the filesystem and its disk usage containing the given file or directory" {
     df apparmor.d/
-    aa_check
 }
 
-# bats test_tags=df
 @test "df: Include statistics on the number of free inodes" {
     df --inodes
-    aa_check
 }
 
-# bats test_tags=df
 @test "df: Display filesystem types" {
     df --print-type
-    aa_check
 }
diff --git a/tests/bats/dfc.bats b/tests/bats/dfc.bats
@@ -5,30  5,18 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=dfc
 @test "dfc: Display filesystems and their disk usage in human-readable form with colors and graphs" {
     dfc
-    aa_check
 }
 
-# bats test_tags=dfc
 @test "dfc: Display all filesystems including pseudo, duplicate and inaccessible filesystems" {
     dfc -a
-    aa_check
 }
 
-# bats test_tags=dfc
 @test "dfc: Display filesystems without color" {
     dfc -c never
-    aa_check
 }
 
-# bats test_tags=dfc
 @test "dfc: Display filesystems containing &#34;ext&#34; in the filesystem type" {
     dfc -t ext
-    aa_check
 }
diff --git a/tests/bats/fc-cache.bats b/tests/bats/fc-cache.bats
@@ -5,25  5,14 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=fc-cache
 @test "fc-cache: Generate font cache files" {
     fc-cache
-    aa_check
 }
 
-# bats test_tags=fc-cache
 @test "fc-cache: Force a rebuild of all font cache files, without checking if cache is up-to-date" {
     fc-cache -f
-    aa_check
 }
 
-# bats test_tags=fc-cache
 @test "fc-cache: Erase font cache files, then generate new font cache files" {
     fc-cache -r
-    aa_check
 }
-
diff --git a/tests/bats/fc-list.bats b/tests/bats/fc-list.bats
@@ -5,12  5,6 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=fc-list
 @test "fc-list: Return a list of installed fonts in your system" {
     fc-list
-    aa_check
 }
diff --git a/tests/bats/flatpak.bats b/tests/bats/flatpak.bats
@@ -5,48  5,30 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=flatpak
 @test "flatpak: List installed applications, ignoring runtimes" {
     flatpak list --app
-    aa_check
 }
 
-# bats test_tags=flatpak
 @test "flatpak: Install an application from a remote source" {
     flatpak install --noninteractive org.vim.Vim
-    aa_check
 }
 
-# bats test_tags=flatpak
 @test "flatpak: Show information about an installed application" {
     flatpak info org.vim.Vim
-    aa_check
 }
 
-# bats test_tags=flatpak
 @test "flatpak: Run an installed application" {
     flatpak run org.vim.Vim
-    aa_check
 }
 
-# bats test_tags=flatpak
 @test "flatpak: Update all installed applications and runtimes" {
     flatpak update --noninteractive
-    aa_check
 }
 
-# bats test_tags=flatpak
 @test "flatpak: Remove an installed application" {
     flatpak remove --noninteractive org.vim.Vim
-    aa_check
 }
 
-# bats test_tags=flatpak
 @test "flatpak: Remove all unused applications" {
     flatpak remove --unused
-    aa_check
 }
diff --git a/tests/bats/gpgconf.bats b/tests/bats/gpgconf.bats
@@ -5,44  5,30 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=gpgconf
 @test "gpgconf: List all components" {
     gpgconf --list-components
-    aa_check
 }
 
-# bats test_tags=gpgconf
 @test "gpgconf: List the directories used by gpgconf" {
     gpgconf --list-dirs
-    aa_check
 }
 
-# bats test_tags=gpgconf
 @test "gpgconf: List all options of a component" {
     gpgconf --list-options gpg
     gpgconf --list-options gpgsm
     gpgconf --list-options gpg-agent
     gpgconf --list-options scdaemon || true
     gpgconf --list-options dirmngr
-    aa_check
 }
 
-# bats test_tags=gpgconf
 @test "gpgconf: List programs and test whether they are runnable" {
     gpgconf --check-programs || true
-    aa_check
 }
 
-# bats test_tags=gpgconf
 @test "gpgconf: Reload a component" {
     gpgconf --reload gpg
     gpgconf --reload gpgsm
     gpgconf --reload gpg-agent
     gpgconf --reload scdaemon || true
     gpgconf --reload dirmngr
-    aa_check
 }
diff --git a/tests/bats/groupadd.bats b/tests/bats/groupadd.bats
@@ -5,32  5,20 @@
 
 load common
 
-setup_file() {
-    aa_setup
-}
-
-# bats test_tags=groupadd
 @test "groupadd: Create a new group" {
     sudo groupadd user2
-    aa_check
 }
 
-# bats test_tags=groupadd
 @test "groupadd: Create a new system group" {
     sudo groupadd --system system2
-    aa_check
 }
 
-# bats test_tags=groupadd
 @test "groupadd: Create a new group with the specific groupid" {
     sudo groupadd --gid 3000 user3
-    aa_check
 }
 
-# bats test_tags=groupadd
 @test "groupdel: Delete newly created group" {
     sudo groupdel user2
     sudo groupdel system2
     sudo groupdel user3
-    aa_check
 }