56f6146b16
After recent upstream rebase few tests were failing: * test_libc_futimes_works FAILED * test_exports_normal FAILED * test_exports_with_force_no_preserve_owner FAILED * test_fat FAILED Patches fixing those issues has been presented upstream shortly after rebasing has been completed. This commit adds backport those fixes. Resolves: RHEL-1770
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
From 49d9cc5897ec2b47ee5ef3254e5d93c7aecb3a52 Mon Sep 17 00:00:00 2001
|
|
From: Michael Vogt <michael.vogt@gmail.com>
|
|
Date: Wed, 17 Jan 2024 09:05:13 +0100
|
|
Subject: [PATCH] test: check that `mkfs.fat` has the `-g` option in `test_fat`
|
|
|
|
Older versions of RHEL/Centos do not have `mkfs.fat -g` yet so
|
|
this test will fail. Detect this and skip the test if mkfs.fat
|
|
is too old (see 7af2f1a for the original commit).
|
|
---
|
|
test/run/test_stages.py | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/test/run/test_stages.py b/test/run/test_stages.py
|
|
index bc6d8b31c..f6156369d 100644
|
|
--- a/test/run/test_stages.py
|
|
+++ b/test/run/test_stages.py
|
|
@@ -573,6 +573,7 @@ def test_btrfs(self):
|
|
assert "path home" in subvols[1]
|
|
|
|
@unittest.skipUnless(test.TestBase.has_filesystem_support("fat"), "FAT needed")
|
|
+ @unittest.skipUnless("-g GEOM" in subprocess.getoutput("mkfs.fat"), "mkfs.fat -g GEOM missing")
|
|
def test_fat(self):
|
|
def _get_file_fields(image: str) -> List[str]:
|
|
r = subprocess.run(
|