From 3dfc7ef4e4274b11a754f2a7fe317ae14e7b64db Mon Sep 17 00:00:00 2001 From: Mike Fleetwood Date: Wed, 8 Feb 2023 09:51:33 +0000 Subject: [PATCH] Speed up signature erasing unit test in Alpine Linux CI test job (#220) Each test in test_EraseFileSystemSignatures is taking just over 10 seconds to run in the Alpine Linux CI image: [ RUN ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDAligned [ OK ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDAligned (10045 ms) [ RUN ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDUnaligned ... [ FAILED ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDUnaligned (10048 ms) [----------] 2 tests from EraseFileSystemSignaturesTest (20093 ms total) [----------] Global test environment tear-down [==========] 2 tests from 1 test case ran. (20093 ms total) This is because the udevadm command is not found and so settle_device() waits for 10 seconds in this call chain: erase_filesystem_signatures() settle_device(SETTLE_DEVICE_APPLY_MAX_WAIT_SECONDS) sleep(10) Install udevadm command into the Alpine Linux CI job docker image to fix this. Now it's on a par with the time taken in the other distro CI test jobs: [ RUN ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDAligned [ OK ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDAligned (417 ms) [ RUN ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDUnaligned ... [ FAILED ] EraseFileSystemSignaturesTest.IntelSoftwareRAIDUnaligned (165 ms) [----------] 2 tests from EraseFileSystemSignaturesTest (582 ms total) [----------] Global test environment tear-down [==========] 2 tests from 1 test case ran. (582 ms total) Closes #220 - Format to Cleared not clearing "pdc" ataraid signature --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a552431e..3e44d6e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ stages: # Extra packages only needed during the test stage. - apk add btrfs-progs btrfs-progs-extra e2fsprogs e2fsprogs-extra exfatprogs dosfstools mtools f2fs-tools jfsutils cryptsetup lvm2 udftools - xfsprogs xfsprogs-extra xvfb-run kmod gzip + xfsprogs xfsprogs-extra xvfb-run kmod gzip eudev .centos_image_template: ¢os_image_definition # Use official CentOS image https://hub.docker.com/_/centos/.