From 4e89ed19760cd8211cc342d9093c3e4dc1d62a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 30 Oct 2019 15:17:40 +0000 Subject: [PATCH 1/3] tests: fix conditional for disabling XTS test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intent is to only enable the XTS test if both CONFIG_BLOCK and CONFIG_QEMU_PRIVATE_XTS are set to 'y'. Signed-off-by: Daniel P. Berrangé Reviewed-by: Alex Bennée Tested-by: Alex Bennée Message-Id: <20191030151740.14326-1-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index c79402ab75..7715d8cd63 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -140,7 +140,7 @@ check-unit-y += tests/test-base64$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT))) += tests/test-crypto-pbkdf$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-ivgen$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-afsplit$(EXESUF) -check-unit-$(if $(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-block$(EXESUF) check-unit-y += tests/test-logging$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_REPLICATION)) += tests/test-replication$(EXESUF) From d2499aca4bac613d837e2720e7bbe3378bc91245 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 29 Oct 2019 19:23:19 -0400 Subject: [PATCH 2/3] Acceptance test: cancel test if m68k kernel packages goes missing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Linux kernel that is extracted from a Debian package for the q800 machine test is hosted on a "pool" location. AFAICT, it gets updated without too much ceremony, and I don't see any archival location that is stable enough. For now, to avoid test errors, let's cancel the test if fetching the package fails. Signed-off-by: Cleber Rosa Reviewed-by: Alex Bennée Message-Id: <20191029232320.12419-2-crosa@redhat.com> Signed-off-by: Alex Bennée --- tests/acceptance/boot_linux_console.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 4e9ac0ecc3..880a4b31ee 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -482,7 +482,10 @@ class BootLinuxConsole(Test): deb_url = ('http://ftp.ports.debian.org/debian-ports/pool-m68k/main' '/l/linux/kernel-image-5.2.0-2-m68k-di_5.2.9-2_m68k.udeb') deb_hash = '0797e05129595f22f3c0142db5e199769a723bf9' - deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) + try: + deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) + except OSError as exp: + self.cancel(exp) kernel_path = self.extract_from_deb(deb_path, '/boot/vmlinux-5.2.0-2-m68k') From 2ecde8b2fb046516a0f2f53fb56b86db92d6fc13 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 29 Oct 2019 19:23:20 -0400 Subject: [PATCH 3/3] Acceptance test: update kernel for m68k/q800 test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's an updated version of the Debian package containing the m68k Kernel. Now, if the package gets updated again, the test won't fail, but will be canceled. A more permanent solution is certainly needed. Signed-off-by: Cleber Rosa Reviewed-by: Alex Bennée Tested-by: Alex Bennée Message-Id: <20191029232320.12419-3-crosa@redhat.com> Signed-off-by: Alex Bennée --- tests/acceptance/boot_linux_console.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 880a4b31ee..7e41cebd47 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -480,14 +480,14 @@ class BootLinuxConsole(Test): :avocado: tags=machine:q800 """ deb_url = ('http://ftp.ports.debian.org/debian-ports/pool-m68k/main' - '/l/linux/kernel-image-5.2.0-2-m68k-di_5.2.9-2_m68k.udeb') - deb_hash = '0797e05129595f22f3c0142db5e199769a723bf9' + '/l/linux/kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.udeb') + deb_hash = '044954bb9be4160a3ce81f8bc1b5e856b75cccd1' try: deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) except OSError as exp: self.cancel(exp) kernel_path = self.extract_from_deb(deb_path, - '/boot/vmlinux-5.2.0-2-m68k') + '/boot/vmlinux-5.3.0-1-m68k') self.vm.set_machine('q800') self.vm.set_console()