From c34cd8e8972ddfefb3e6a7c3fd49729c12d71c23 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 7 Feb 2025 13:32:37 +0200 Subject: [PATCH] Add tests for HDRID, PKGID and SOURCEPKGID These need to exist and match across source <-> binary in v4 packages, and must not exist at all in v6 because they are based on obsolete crypto (SHA1 and MD5) in a way that we can't compatibly change. Related: #3330 --- tests/rpmpkgfmt.at | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tests/rpmpkgfmt.at b/tests/rpmpkgfmt.at index e2ed1b3551..99a265eb88 100644 --- a/tests/rpmpkgfmt.at +++ b/tests/rpmpkgfmt.at @@ -21,6 +21,33 @@ rpm -qp --qf "%{rpmformat}\n" ${RPMTEST}/build/RPMS/4/noarch/attrtest-1.0-1.noar ], []) +RPMTEST_CHECK([[ +sid=$(rpm -qp --qf "%{pkgid}\n" ${RPMTEST}/build/SRPMS/attrtest-1.0-1.src.rpm) +pid=$(rpm -qp --qf "%{pkgid}\n" ${RPMTEST}/build/RPMS/4/noarch/attrtest-1.0-1.noarch.rpm) +spid=$(rpm -qp --qf "%{sourcepkgid}\n" ${RPMTEST}/build/RPMS/4/noarch/attrtest-1.0-1.*.rpm) +hid=$(rpm -qp --qf "%{hdrid}\n" ${RPMTEST}/build/RPMS/4/noarch/attrtest-1.0-1.noarch.rpm) +shid=$(rpm -qp --qf "%{hdrid}\n" ${RPMTEST}/build/SRPMS/attrtest-1.0-1.src.rpm) + +# only validate the general characteristics here to avoid pinning +echo -n ${sid} | wc -c +echo -n ${pid} | wc -c +echo -n ${spid} | wc -c +echo -n ${hid} | wc -c +echo -n ${shid} | wc -c +[ "${sid}" = "${spid}" ] || exit 1 +[ "${sid}" != "${pid}" ] || exit 1 +[ "${pid}" != "${spid}" ] || exit 1 +[ "${hid}" != "${shid}" ] || exit 1 +]], +[0], +[32 +32 +32 +40 +40 +], +[]) + RPMTEST_CHECK([ cp /data/misc/rpmdump4-srpm.txt expout ${RPM_CONFIGDIR_PATH}/rpmdump ${RPMTEST}/build/SRPMS/attrtest-1.0-1.src.rpm @@ -53,6 +80,22 @@ rpm -qp --qf "%{rpmformat}\n" ${RPMTEST}/build/RPMS/6/noarch/attrtest-1.0-1.noar ], []) +RPMTEST_CHECK([ +rpm -qp --qf "%{pkgid}\n" ${RPMTEST}/build/SRPMS/attrtest-1.0-1.src.rpm +rpm -qp --qf "%{pkgid}\n" ${RPMTEST}/build/RPMS/6/noarch/attrtest-1.0-1.noarch.rpm +rpm -qp --qf "%{sourcepkgid}\n" ${RPMTEST}/build/RPMS/6/noarch/attrtest-1.0-1.noarch.rpm +rpm -qp --qf "%{hdrid}\n" ${RPMTEST}/build/RPMS/6/noarch/attrtest-1.0-1.noarch.rpm +rpm -qp --qf "%{hdrid}\n" ${RPMTEST}/build/SRPMS/attrtest-1.0-1.src.rpm +], +[0], +[(none) +(none) +(none) +(none) +(none) +], +[]) + RPMTEST_CHECK([ cp /data/misc/rpmdump6-srpm.txt expout ${RPM_CONFIGDIR_PATH}/rpmdump ${RPMTEST}/build/SRPMS/attrtest-1.0-1.src.rpm