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
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 01446c54110e929d5b1a315003cdcce5032a7427 Mon Sep 17 00:00:00 2001
|
|
From: Michael Vogt <michael.vogt@gmail.com>
|
|
Date: Wed, 17 Jan 2024 08:45:19 +0100
|
|
Subject: [PATCH] test: export schemas in testing_libdir_fixture
|
|
|
|
When constructing a minimal environment for osbuild the exported
|
|
dirs lacked "schemas" so the test_exports.py test failed on RHEL8.
|
|
|
|
This commit adds it (and also "assemblers" for good measure). With
|
|
that the test will pass.
|
|
---
|
|
test/run/test_exports.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/test/run/test_exports.py b/test/run/test_exports.py
|
|
index 12b4cfe73..d89096494 100644
|
|
--- a/test/run/test_exports.py
|
|
+++ b/test/run/test_exports.py
|
|
@@ -58,7 +58,7 @@ def testing_libdir_fixture(tmpdir_factory):
|
|
# in buildroot.py
|
|
(fake_libdir_path / "osbuild").mkdir()
|
|
# construct minimal viable libdir from current checkout
|
|
- for d in ["stages", "runners", ]:
|
|
+ for d in ["stages", "runners", "schemas", "assemblers"]:
|
|
subprocess.run(
|
|
["cp", "-a", os.fspath(project_path / d), f"{fake_libdir_path}"],
|
|
check=True)
|