Skip to content

Commit dbeea07

Browse files
committed
Use resolve() instead of normpath for librrd path comparison
Ubuntu 26.04's ldd resolves symlinks and returns the real path under /opt/omd/versions/... rather than the site symlink path under /omd/sites/int_test/. normpath only flattens .. components; resolve() also follows symlinks, making both sides of the assertion canonical before comparing. CMK-31095 Change-Id: Icedfdb9bab05c163a7fcc5063b2bc8aa582aafdd (cherry picked from commit 862061e)
1 parent 60fd1ce commit dbeea07

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tests/integration/omd/test_linked_libraries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,6 @@ def test_perl_rrds_links_against_omd_rrd_so(site: Site) -> None:
206206
)
207207
rrd_path = linked_rrd_libs[0].path
208208
assert rrd_path is not None, "librrd should be found by ldd"
209-
assert Path(os.path.normpath(rrd_path)) == Path(site.root) / "lib/librrd.so.8", (
209+
assert Path(rrd_path).resolve() == (Path(site.root) / "lib/librrd.so.8").resolve(), (
210210
"RRDs.so should link against a librrd which is shipped with omd."
211211
)

0 commit comments

Comments
 (0)