From 2a201ab62cd5e1d4bd5b034a006accdb26284d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?= <2031761+viniciusferrao@users.noreply.github.com> Date: Mon, 12 Oct 2026 19:08:46 -0300 Subject: [PATCH] test(genesis): prepare shared runtime library fixtures --- xCAT-test/bats/genesis_openembedded_discovery.bats | 1 + xCAT-test/native/genesis_metadata.py | 9 ++++++++- xCAT-test/unit/genesis_openembedded_discovery.t | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xCAT-test/bats/genesis_openembedded_discovery.bats b/xCAT-test/bats/genesis_openembedded_discovery.bats index 0331a3f5b..dcce62f7e 100644 --- a/xCAT-test/bats/genesis_openembedded_discovery.bats +++ b/xCAT-test/bats/genesis_openembedded_discovery.bats @@ -135,6 +135,7 @@ SH export XCAT_PROC_ROOT="$proc" export XCAT_STATE_DIR="$state_dir" export XCAT_STATUS_COMMAND="$(require_repo_file 'xCAT-genesis-base/oe/meta-xcat-genesis/recipes-core/xcat-genesis-init/files/genesis-status')" + export XCAT_GENESIS_FUNCTIONS="$(require_repo_file 'xCAT-genesis-base/oe/meta-xcat-genesis/recipes-core/xcat-genesis-init/files/genesis-functions')" export XCAT_STATUS_DIR="$state_dir/status" export XCAT_SYS_ROOT="$root" export XCAT_TEST_LOG="$root/commands.log" diff --git a/xCAT-test/native/genesis_metadata.py b/xCAT-test/native/genesis_metadata.py index dfb901384..7a8b0550c 100644 --- a/xCAT-test/native/genesis_metadata.py +++ b/xCAT-test/native/genesis_metadata.py @@ -201,6 +201,9 @@ class GenesisMetadata(unittest.TestCase): }.items(): self.assertEqual(self.dependencies(recipe), set(expected.split()), recipe) self.assertLessEqual({"coreutils", "util-linux-logger"}, self.dependencies("xcat-genesis-init")) + discovery = self.dependencies("xcat-genesis-discovery") - {"xcat-genesis-common"} + self.assertEqual(discovery, set("bash coreutils gzip iproute2 openssl-bin " + "util-linux-logger util-linux-lsblk".split())) console = self.recipe("xcat-genesis-console") self.assertLessEqual({"libnewt", "systemd"}, self.words(console, "DEPENDS")) self.assertIn("sysext", self.words(self.recipe("systemd"), "PACKAGECONFIG")) @@ -296,7 +299,11 @@ class GenesisMetadata(unittest.TestCase): def test_installed_init(self): data, root = self.install("xcat-genesis-init") - self.installed(data, root, "libexecdir", "xcat/genesis-functions", 0o644) + library_owner = "xcat-genesis-init" + if "xcat-genesis-common" in self.dependencies(library_owner): + library_owner = "xcat-genesis-common" + library_data, library_root = self.install(library_owner) + self.installed(library_data, library_root, "libexecdir", "xcat/genesis-functions", 0o644) for name in ("genesis-status", "genesis-maintenance-shell"): self.installed(data, root, "libexecdir", "xcat/" + name, 0o755) self.assertFalse(list(root.rglob("*debug-shell*"))) diff --git a/xCAT-test/unit/genesis_openembedded_discovery.t b/xCAT-test/unit/genesis_openembedded_discovery.t index 8966c85aa..b2c6ebbcd 100644 --- a/xCAT-test/unit/genesis_openembedded_discovery.t +++ b/xCAT-test/unit/genesis_openembedded_discovery.t @@ -15,8 +15,6 @@ my $META = 'xCAT-genesis-base/oe/meta-xcat-genesis'; my $recipe = slurp_repo_file( "$META/recipes-xcat/xcat-genesis-discovery/xcat-genesis-discovery_1.0.bb"); -like( $recipe, qr/^RDEPENDS:\$\{PN\} = "bash coreutils gzip iproute2 openssl-bin util-linux-logger util-linux-lsblk"$/m, - 'discovery dependencies are explicit' ); like( $recipe, qr/xcat-genesis-discovery\.socket/, 'discovery callback socket is packaged' ); like( $recipe, qr/xcat-genesis-credential\.socket/,