From d6e82368606a18e4eb8534cb4ab30b61fc930cd9 Mon Sep 17 00:00:00 2001 From: Mike Fleetwood Date: Mon, 14 Oct 2019 08:04:20 +0100 Subject: [PATCH] Skip Check MINIX file system interface test (!49) Checking a MINIX V3 file system fails like this: $ ./test_SupportedFileSystems --gtest_filter='*Check/minix' ... [ RUN ] My/SupportedFileSystemsTest.CreateAndCheck/minix test_SupportedFileSystems.cc:554: Failure Value of: m_fs_object->check_repair(m_partition, m_operation_detail) Actual: false Expected: true Operation details: mkfs.minix -3 '/home/centos/programming/c/gparted/tests/test_SupportedFileSystems.img' 00:00:00 (SUCCESS) 87392 inodes 262144 blocks Firstdatazone=5507 (5507) Zonesize=1024 Maxsize=2147483647 fsck.minix '/home/centos/programming/c/gparted/tests/test_SupportedFileSystems.img' 00:00:00 (ERROR) fsck.minix from util-linux 2.23.2 bad magic number in super-block [ FAILED ] My/SupportedFileSystemsTest.CreateAndCheck/minix, where GetParam() = 21 (182 ms) fsck.minix doesn't support checking MINIX V3 file systems until this commit, first included in util-linux 2.27 released 2015-09-07. https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=86a9f3dad58addb50eca9daa9d233827a005dad7 fsck.minix: add minix v3 support CentOS 7 only includes util-linux 2.23.2 so is affected by this, however Ubuntu 18.04 LTS includes util-linux 2.31.1 so is not affected. Just always skip this test for now. Plan to re-enable later when the oldest supported distributions and GitLab CI images include the needed util-linux release. Closes !49 - Add file system interface tests --- tests/test_SupportedFileSystems.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/test_SupportedFileSystems.cc b/tests/test_SupportedFileSystems.cc index 1f218aee..aca004a9 100644 --- a/tests/test_SupportedFileSystems.cc +++ b/tests/test_SupportedFileSystems.cc @@ -219,6 +219,15 @@ const std::string param_fsname(const ::testing::TestParamInfo& info) } +#define SKIP_IF_TEST_DISABLED_FOR_FS(fstype) \ + if (m_fstype == fstype) \ + { \ + std::cout << __FILE__ << ":" << __LINE__ << ": Skip test. " \ + << "Test disabled for file system" << std::endl; \ + return; \ + } + + const Byte_Value IMAGESIZE_Default = 256*MEBIBYTE; const Byte_Value IMAGESIZE_Larger = 512*MEBIBYTE; @@ -601,6 +610,7 @@ TEST_P(SupportedFileSystemsTest, CreateAndCheck) SKIP_IF_FS_DOESNT_SUPPORT(create); SKIP_IF_FS_DOESNT_SUPPORT(check); SKIP_IF_NOT_ROOT_FOR_REQUIRED_LOOPDEV_FOR_FS(FS_LVM2_PV); + SKIP_IF_TEST_DISABLED_FOR_FS(FS_MINIX); // FIXME: Enable when util-linux >= 2.27 is available everywhere extra_setup(); ASSERT_TRUE(m_fs_object->create(m_partition, m_operation_detail)) << m_operation_detail;