diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75fa5c051..c97229256 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,9 +125,9 @@ jobs: run: | bash tests/requirements.sh - - name: Run the bats integration tests + - name: Run the integration tests run: | - make bats + make integration - name: Show final AppArmor logs if: always() diff --git a/Makefile b/Makefile index 7de055c9f..90dacd5c0 100644 --- a/Makefile +++ b/Makefile @@ -111,9 +111,9 @@ lint: check: @bash tests/check.sh -.PHONY: bats -bats: - @bats --timing --print-output-on-failure tests/bats/ +.PHONY: integration +integration : + @bats --timing --print-output-on-failure tests/integration/ .PHONY: manual manual: diff --git a/tests/bats/aa-enforce.bats b/tests/integration/aa-enforce.bats similarity index 100% rename from tests/bats/aa-enforce.bats rename to tests/integration/aa-enforce.bats diff --git a/tests/bats/aa-status.bats b/tests/integration/aa-status.bats similarity index 100% rename from tests/bats/aa-status.bats rename to tests/integration/aa-status.bats diff --git a/tests/bats/blkid.bats b/tests/integration/blkid.bats similarity index 100% rename from tests/bats/blkid.bats rename to tests/integration/blkid.bats diff --git a/tests/bats/chsh.bats b/tests/integration/chsh.bats similarity index 100% rename from tests/bats/chsh.bats rename to tests/integration/chsh.bats diff --git a/tests/bats/common.bash b/tests/integration/common.bash similarity index 100% rename from tests/bats/common.bash rename to tests/integration/common.bash diff --git a/tests/bats/cpuid.bats b/tests/integration/cpuid.bats similarity index 100% rename from tests/bats/cpuid.bats rename to tests/integration/cpuid.bats diff --git a/tests/bats/df.bats b/tests/integration/df.bats similarity index 100% rename from tests/bats/df.bats rename to tests/integration/df.bats diff --git a/tests/bats/dfc.bats b/tests/integration/dfc.bats similarity index 100% rename from tests/bats/dfc.bats rename to tests/integration/dfc.bats diff --git a/tests/bats/dmesg.bats b/tests/integration/dmesg.bats similarity index 100% rename from tests/bats/dmesg.bats rename to tests/integration/dmesg.bats diff --git a/tests/bats/fc-cache.bats b/tests/integration/fc-cache.bats similarity index 100% rename from tests/bats/fc-cache.bats rename to tests/integration/fc-cache.bats diff --git a/tests/bats/fc-list.bats b/tests/integration/fc-list.bats similarity index 100% rename from tests/bats/fc-list.bats rename to tests/integration/fc-list.bats diff --git a/tests/bats/flatpak.bats b/tests/integration/flatpak.bats similarity index 100% rename from tests/bats/flatpak.bats rename to tests/integration/flatpak.bats diff --git a/tests/bats/fwupdmgr.bats b/tests/integration/fwupdmgr.bats similarity index 100% rename from tests/bats/fwupdmgr.bats rename to tests/integration/fwupdmgr.bats diff --git a/tests/bats/gpgconf.bats b/tests/integration/gpgconf.bats similarity index 100% rename from tests/bats/gpgconf.bats rename to tests/integration/gpgconf.bats diff --git a/tests/bats/groupadd.bats b/tests/integration/groupadd.bats similarity index 100% rename from tests/bats/groupadd.bats rename to tests/integration/groupadd.bats diff --git a/tests/bats/groups.bats b/tests/integration/groups.bats similarity index 100% rename from tests/bats/groups.bats rename to tests/integration/groups.bats diff --git a/tests/bats/homectl.bats b/tests/integration/homectl.bats similarity index 100% rename from tests/bats/homectl.bats rename to tests/integration/homectl.bats diff --git a/tests/bats/hostnamectl.bats b/tests/integration/hostnamectl.bats similarity index 100% rename from tests/bats/hostnamectl.bats rename to tests/integration/hostnamectl.bats diff --git a/tests/bats/id.bats b/tests/integration/id.bats similarity index 100% rename from tests/bats/id.bats rename to tests/integration/id.bats diff --git a/tests/bats/ip.bats b/tests/integration/ip.bats similarity index 100% rename from tests/bats/ip.bats rename to tests/integration/ip.bats diff --git a/tests/bats/lsblk.bats b/tests/integration/lsblk.bats similarity index 100% rename from tests/bats/lsblk.bats rename to tests/integration/lsblk.bats diff --git a/tests/bats/lscpu.bats b/tests/integration/lscpu.bats similarity index 100% rename from tests/bats/lscpu.bats rename to tests/integration/lscpu.bats diff --git a/tests/bats/lspci.bats b/tests/integration/lspci.bats similarity index 100% rename from tests/bats/lspci.bats rename to tests/integration/lspci.bats diff --git a/tests/bats/lsusb.bats b/tests/integration/lsusb.bats similarity index 100% rename from tests/bats/lsusb.bats rename to tests/integration/lsusb.bats diff --git a/tests/bats/needrestart.bats b/tests/integration/needrestart.bats similarity index 100% rename from tests/bats/needrestart.bats rename to tests/integration/needrestart.bats diff --git a/tests/bats/ps.bats b/tests/integration/ps.bats similarity index 100% rename from tests/bats/ps.bats rename to tests/integration/ps.bats diff --git a/tests/bats/pstree.bats b/tests/integration/pstree.bats similarity index 100% rename from tests/bats/pstree.bats rename to tests/integration/pstree.bats diff --git a/tests/bats/snap.bats b/tests/integration/snap.bats similarity index 100% rename from tests/bats/snap.bats rename to tests/integration/snap.bats diff --git a/tests/bats/sync.bats b/tests/integration/sync.bats similarity index 100% rename from tests/bats/sync.bats rename to tests/integration/sync.bats diff --git a/tests/bats/sysctl.bats b/tests/integration/sysctl.bats similarity index 100% rename from tests/bats/sysctl.bats rename to tests/integration/sysctl.bats diff --git a/tests/bats/systemd-ac-power.bats b/tests/integration/systemd-ac-power.bats similarity index 100% rename from tests/bats/systemd-ac-power.bats rename to tests/integration/systemd-ac-power.bats diff --git a/tests/bats/systemd-analyze.bats b/tests/integration/systemd-analyze.bats similarity index 100% rename from tests/bats/systemd-analyze.bats rename to tests/integration/systemd-analyze.bats diff --git a/tests/bats/systemd-cat.bats b/tests/integration/systemd-cat.bats similarity index 100% rename from tests/bats/systemd-cat.bats rename to tests/integration/systemd-cat.bats diff --git a/tests/bats/systemd-cgls.bats b/tests/integration/systemd-cgls.bats similarity index 100% rename from tests/bats/systemd-cgls.bats rename to tests/integration/systemd-cgls.bats diff --git a/tests/bats/systemd-detect-virt.bats b/tests/integration/systemd-detect-virt.bats similarity index 100% rename from tests/bats/systemd-detect-virt.bats rename to tests/integration/systemd-detect-virt.bats diff --git a/tests/bats/systemd-id128.bats b/tests/integration/systemd-id128.bats similarity index 100% rename from tests/bats/systemd-id128.bats rename to tests/integration/systemd-id128.bats diff --git a/tests/bats/systemd-sysusers.bats b/tests/integration/systemd-sysusers.bats similarity index 100% rename from tests/bats/systemd-sysusers.bats rename to tests/integration/systemd-sysusers.bats diff --git a/tests/bats/uname.bats b/tests/integration/uname.bats similarity index 100% rename from tests/bats/uname.bats rename to tests/integration/uname.bats diff --git a/tests/bats/upower.bats b/tests/integration/upower.bats similarity index 100% rename from tests/bats/upower.bats rename to tests/integration/upower.bats diff --git a/tests/bats/uptime.bats b/tests/integration/uptime.bats similarity index 100% rename from tests/bats/uptime.bats rename to tests/integration/uptime.bats diff --git a/tests/bats/useradd.bats b/tests/integration/useradd.bats similarity index 100% rename from tests/bats/useradd.bats rename to tests/integration/useradd.bats diff --git a/tests/bats/userdbctl.bats b/tests/integration/userdbctl.bats similarity index 100% rename from tests/bats/userdbctl.bats rename to tests/integration/userdbctl.bats diff --git a/tests/bats/users.bats b/tests/integration/users.bats similarity index 100% rename from tests/bats/users.bats rename to tests/integration/users.bats diff --git a/tests/bats/uuidd.bats b/tests/integration/uuidd.bats similarity index 100% rename from tests/bats/uuidd.bats rename to tests/integration/uuidd.bats diff --git a/tests/bats/uuidgen.bats b/tests/integration/uuidgen.bats similarity index 100% rename from tests/bats/uuidgen.bats rename to tests/integration/uuidgen.bats diff --git a/tests/bats/w.bats b/tests/integration/w.bats similarity index 100% rename from tests/bats/w.bats rename to tests/integration/w.bats diff --git a/tests/bats/who.bats b/tests/integration/who.bats similarity index 100% rename from tests/bats/who.bats rename to tests/integration/who.bats