mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-09-05 12:37:54 +00:00
Daniel Hilst
d5d89ade6c
ubuntu_2604_pkglist.t matched regexes against Template.pm's `push @lines` literals, and ubuntu_subiquity_storage.t was source greps end to end. Both pass when the code is moved somewhere it never runs, and both break on a reformat that changes nothing: reordering two keys inside the efi-part stanza -- identical emitted config -- fails the old efi-part match. The apt config is now rendered by calling ubuntu_subiquity_apt_config and asserting on its output. Only the two collaborators that read the xCAT database are stubbed; the release branch is driven for real through the media directory the renderer parses, so 26.04, 24.04 and pre-Deb822 each render their own shape. The Release-index requirement is exercised against a real directory instead of matched as a shell fragment. The partitioning moves to ubuntu_subiquity_storage.t, which owns that topic and was asserting the same facts by grep. The script cannot run here -- it stops syslog and carries xCAT template markers -- so the block that writes the partition file is lifted out and executed with its one bracket test shadowed by a shell function, which bash resolves ahead of the builtin, leaving the script's own condition unmodified. The emitted curtin config is parsed into id => attributes, so the assertions survive reindentation and reordering. Both extractions BAIL_OUT if their anchors stop matching, and the partition-file redirect is asserted to have been pointed at the scratch tree twice before anything runs, so a rewrite that stops matching fails loudly instead of writing to /tmp. Verified by mutation: dropping grub_device, formatting the ESP ext4, moving its mount point, dropping the bios_grub flag, indenting the block off column 0, dropping Enabled: no, rendering a live cdrom source on 26.04, dropping the Check-Date waiver, dropping the offline fallback and dropping the Release requirement each redden the suite; the pure key reorder that broke the old assertion leaves it green. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>