b998afb Convert the autoupgrade tests to use new_pkg — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Convert the autoupgrade tests to use new_pkg

Brad Davis committed 8 years ago

commit b998afba08d29315f9c28f8b85b52a030510932a
parent 033b84c

1 file changed +4 -54

modified tests/frontend/autoupgrade.sh

@@ -8,33 +8,8 @@ tests_init \

 autoupgrade_body() {
 	cat << EOF > pkg1.ucl
 name: pkg
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 EOF
 	cat << EOF > pkg2.ucl
 name: pkg
 origin: test
 version: 1_1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 EOF
 	atf_check -s exit:0 $(atf_get_srcdir)/test_subr.sh new_pkg pkg1 pkg 1
 	atf_check -s exit:0 $(atf_get_srcdir)/test_subr.sh new_pkg pkg2 pkg 1_1
 	atf_check \
 		-o match:".*Installing.*\.\.\.$" \

@@ -74,33 +49,8 @@ autoupgrade_multirepo_head() {

 autoupgrade_multirepo_body() {
 	cat << EOF > pkg1.ucl
 name: pkg
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 EOF
 	cat << EOF > pkg2.ucl
 name: pkg
 origin: test
 version: "1.1"
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 EOF
 	atf_check -s exit:0 $(atf_get_srcdir)/test_subr.sh new_pkg pkg1 pkg 1
 	atf_check -s exit:0 $(atf_get_srcdir)/test_subr.sh new_pkg pkg2 pkg 1.1
 	atf_check \
 		-o match:".*Installing.*\.\.\.$" \