On 02/15/2018 11:04 PM, Luke Shumaker wrote:
From: Luke Shumaker <lukeshu@parabola.nu>
This has the test change PKGEXT the second time it tries to release the package. Currently, this causes the tests to fail. That's a good thing; it's checking for the regression where db-functions:check_pkgrepos isn't treating PKGEXT as a glob.
Without this, that regression didn't cause test failure because the checks right after it were tripping anyway.
https://lists.archlinux.org/pipermail/arch-projects/2018-February/004742.htm...
This looks reasonable, thanks. BTW no need to send a cover letter for one patch. :)
--- test/cases/db-update.bats | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/test/cases/db-update.bats b/test/cases/db-update.bats index 1da7eef..6604841 100644 --- a/test/cases/db-update.bats +++ b/test/cases/db-update.bats @@ -92,7 +92,16 @@ load ../lib/common db-update checkPackage extra pkg-any-a
- releasePackage extra pkg-any-a + # don't let __buildPackage use the cached build; we want to + # force a new build with a different PKGEXT. + if [[ -n ${BUILDDIR} ]]; then + mv -T "${BUILDDIR}/$(__getCheckSum "${TMP}/svn-packages-copy/pkg-any-a/trunk/PKGBUILD")"{,.bak} + fi + PKGEXT=.pkg.tar.gz releasePackage extra pkg-any-a + if [[ -n ${BUILDDIR} ]]; then + rm -rf "${BUILDDIR}/$(__getCheckSum "${TMP}/svn-packages-copy/pkg-any-a/trunk/PKGBUILD")" + mv -T "${BUILDDIR}/$(__getCheckSum "${TMP}/svn-packages-copy/pkg-any-a/trunk/PKGBUILD")"{.bak,} + fi run db-update [ "$status" -ne 0 ] }
I'm guessing you restore the old version because the new version will throw off other tests using the cached version with the wrong $PKGEXT? It might make more sense to change __buildPackage() to use is_globfile ${cache}*${PKGEXT} rather than [[ -d ${cache} ]] This should prevent needing to move anything, leading to cleaner code on both sides. -- Eli Schwartz Bug Wrangler and Trusted User