From 2bc3393fce6c18f11b250bd8eded3112a1b2c7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 31 Dec 2020 06:12:02 +0100 Subject: [PATCH] tests: skip pvgrub tests on Fedora Fedora compresses the kernel with zstd now, which isn't suppported in grub (as of 2.04). Since we don't care about PV that much anymore, simply skip the test there. --- qubes/tests/integ/grub.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qubes/tests/integ/grub.py b/qubes/tests/integ/grub.py index 11b84ca4..abed4f07 100644 --- a/qubes/tests/integ/grub.py +++ b/qubes/tests/integ/grub.py @@ -157,6 +157,15 @@ class TC_40_PVGrub(GrubBase): virt_mode = 'pv' kernel = 'pvgrub2' + def setUp(self): + if 'fedora' in self.template: + # requires a zstd decompression filter in grub + # (see grub_file_filter_id enum in grub sources) + self.skipTest('Fedora kernel is compressed with zstd ' + 'which is not supported by pvgrub2') + super().setUp() + + class TC_41_HVMGrub(GrubBase): virt_mode = 'hvm' kernel = None