3c670fd Switch to using new_pkg() from test_subr.sh — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Switch to using new_pkg() from test_subr.sh

Brad Davis committed 8 years ago

commit 3c670fd19762d1794dca87faea72d5ec02d2e6d4
parent 50fa4ad

1 file changed +4 -20

modified tests/frontend/register.sh

@@ -11,16 +11,8 @@ register_conflicts_body() {

 	mkdir -p teststage/${TMPDIR}
 	echo a > teststage/${TMPDIR}/plop
 	sum=$(openssl dgst -sha256 -binary teststage/${TMPDIR}/plop | hexdump -v -e '/1 "%x"')
 	cat > test.ucl << EOF
 name: "test"
 origin: "osef"
 version: "1"
 arch: "freebsd:*"
 maintainer: "non"
 prefix: "${TMPDIR}"
 www: "unknown"
 comment: "need one"
 desc: "here as well"
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
 	cat >> test.ucl << EOF
 files: {
 	"${TMPDIR}/plop" : "$sum"
 }

@@ -34,16 +26,8 @@ EOF

 	atf_check_equal ${sum} ${nsum}
 	rm -f test.ucl
 	echo b > teststage/${TMPDIR}/plop
 	cat > test.ucl << EOF
 name: "test2"
 origin: "osef"
 version: "1"
 arch: "freebsd:*"
 maintainer: "non"
 prefix: "${TMPDIR}"
 www: "unknown"
 comment: "need one"
 desc: "here as well"
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test2 1
 	cat >> test.ucl << EOF
 files: {
 	"${TMPDIR}/plop" : "$sum2"
 }