From 6c5507b1747ba0b3aeb66d1edb77042f887e9b80 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 30 Apr 2021 15:46:55 -0700 Subject: [PATCH] Add an 'unwanted packages' test, run on Workstation for now (#218) This adds a test that just fails if any one of a given list of unwanted packages is installed. This was a request for the Workstation edition from @catanzaro so I've just implemented it for Workstation so far, but it's designed to be easily extended to cover other subvariants too if we want. Signed-off-by: Adam Williamson --- templates.fif.json | 13 +++++++++++++ tests/unwanted_packages.pm | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 tests/unwanted_packages.pm diff --git a/templates.fif.json b/templates.fif.json index 2aa5afe6..ceee16a8 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -2231,6 +2231,19 @@ "WORKER_CLASS": "tap" } }, + "unwanted_packages": { + "profiles": { + "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 50, + "fedora-Workstation-live-iso-x86_64-*-64bit": 50, + "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 52 + }, + "settings": { + "BOOTFROM": "c", + "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", + "POSTINSTALL": "unwanted_packages", + "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%" + } + }, "upgrade_2_desktop_64bit": { "profiles": { "fedora-universal-x86_64-*-64bit": 40 diff --git a/tests/unwanted_packages.pm b/tests/unwanted_packages.pm new file mode 100644 index 00000000..b924345d --- /dev/null +++ b/tests/unwanted_packages.pm @@ -0,0 +1,28 @@ +use base "installedtest"; +use strict; +use testapi; +use utils; + +sub run { + my $self = shift; + bypass_1691487 unless (get_var("DESKTOP")); + # switch to TTY3 for both, graphical and console tests + $self->root_console(tty=>3); + my @unwanteds; + my $subv = get_var("SUBVARIANT"); + if ($subv eq "Workstation") { + @unwanteds = ("gtk2"); + } + for my $unwanted (@unwanteds) { + assert_script_run "! rpm -q $unwanted"; + } +} + + +sub test_flags { + return { fatal => 1 }; +} + +1; + +# vim: set sw=4 et: