Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2368a91
Fix most of the tests after the removal of a useless error message
Baptiste Daroussin committed 7 years ago
commit 2368a91efb53889ab233ef88e8b12a3114257303
parent 5fdab2d
20 files changed +12 -41
modified tests/frontend/autoupgrade.sh
@@ -38,7 +38,6 @@ EOF


	atf_check \

		-o match:".*New version of pkg detected.*" \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:1 \

		pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -n

}
@@ -98,13 +97,11 @@ EOF
	export REPOS_DIR="${TMPDIR}"

	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg install -r repo1 -fy pkg-1



	atf_check \

		-o match:".*New version of pkg detected.*" \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg upgrade -y
modified tests/frontend/configmerge.sh
@@ -41,7 +41,6 @@ config_body()
	pkg repo .

	echo "local: { url: file://${TMPDIR} }" > local.conf

	atf_check \
- 
		-e match:".*load error: access repo file.*" \

		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target upgrade -qy test



	atf_check \
@@ -79,7 +78,6 @@ config_fileexist_body()
	pkg repo .

	echo "local: { url: file://${TMPDIR} }" > local.conf

	atf_check \
- 
		-e match:".*load error: access repo file.*" \

		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target upgrade -qy test



	test -f ${TMPDIR}/target/${TMPDIR}/a.pkgnew || atf_fail "file overwritten when it should not have"
@@ -104,7 +102,6 @@ config_hardlink_body()


	# Install the pkg

	atf_check \
- 
		-e match:".*load error: access repo file.*" \

		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target install -qy test

	rm *.txz
@@ -152,7 +149,6 @@ config_fileexist_notinpkg_body()
	pkg repo .

	echo "local: { url: file://${TMPDIR} }" > local.conf

	atf_check \
- 
		-e match:".*load error: access repo file.*" \

		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target install -qy test



	test -f ${TMPDIR}/target/${TMPDIR}/a.pkgnew || atf_fail "file overwritten when it should not have"
@@ -161,9 +157,9 @@ config_fileexist_notinpkg_body()
config_morecomplicated_body()

{

	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
- 
	echo "entry1" > test.conf
- 
	echo "entry3" >> test.conf
- 
	echo "@config ${TMPDIR}/test.conf" > plist
+ 
	echo "entry1" > test.config
+ 
	echo "entry3" >> test.config
+ 
	echo "@config ${TMPDIR}/test.config" > plist



	atf_check \

		pkg create -M test.ucl -p plist
@@ -176,21 +172,21 @@ config_morecomplicated_body()
	unset PKG_DBDIR

	atf_check \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.txz
- 
	test -f ${TMPDIR}/target/${TMPDIR}/test.conf || atf_fail "file absent"
+ 
	test -f ${TMPDIR}/target/${TMPDIR}/test.config || atf_fail "file absent"



	atf_check \

		-o inline:"entry1\nentry3\n" \
- 
		cat ${TMPDIR}/target/${TMPDIR}/test.conf
+ 
		cat ${TMPDIR}/target/${TMPDIR}/test.config
- 
	echo "entry4" >> ${TMPDIR}/target/${TMPDIR}/test.conf
+ 
	echo "entry4" >> ${TMPDIR}/target/${TMPDIR}/test.config

	atf_check \

		-o inline:"entry1\nentry3\nentry4\n" \
- 
		cat ${TMPDIR}/target/${TMPDIR}/test.conf
+ 
		cat ${TMPDIR}/target/${TMPDIR}/test.config



	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
- 
	echo "entry1" > test.conf
- 
	echo "entry2" >> test.conf
- 
	echo "entry3" >> test.conf
+ 
	echo "entry1" > test.config
+ 
	echo "entry2" >> test.config
+ 
	echo "entry3" >> test.config



	atf_check \

		pkg create -M test.ucl -p plist
@@ -201,10 +197,9 @@ config_morecomplicated_body()


	echo "local: { url: file://${TMPDIR} }" > local.conf

	atf_check \
- 
		-e match:".*load error: access repo file.*" \

		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target upgrade -qy test



	atf_check \

		-o inline:"entry1\nentry2\nentry3\nentry4\n" \
- 
		cat ${TMPDIR}/target/${TMPDIR}/test.conf
+ 
		cat ${TMPDIR}/target/${TMPDIR}/test.config

}
modified tests/frontend/conflicts-multirepo.sh
@@ -178,7 +178,6 @@ ${JAILED}[2/2] Extracting test-1.1: done
"

	atf_check \

		-o inline:"${OUTPUT}" \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o CONSERVATIVE_UPGRADE=no -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y

}
modified tests/frontend/conflicts.sh
@@ -57,7 +57,6 @@ EOF


	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -C ./pkg.conf update -f
@@ -238,7 +237,6 @@ ${JAILED}[2/2] Extracting test2-1: done
"

	atf_check \

		-o inline:"${OUTPUT}" \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y test2-1

}
modified tests/frontend/fingerprint.sh
@@ -65,7 +65,7 @@ local: {
EOF

	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \
+ 
		-e match:".*extracting signature of repo.*" \

		pkg -dd -o REPOS_DIR="${TMPDIR}" \

		-o PKG_CACHEDIR="${TMPDIR}" update

}
modified tests/frontend/formula.sh
@@ -72,7 +72,6 @@ Number of packages to be installed: 2
"

	atf_check \

	    -o inline:"${OUTPUT}" \
- 
	    -e match:".*load error: access repo file.*" \

	    -s exit:1 \

	    pkg -o REPOS_DIR="${TMPDIR}" install -n b

}
modified tests/frontend/install.sh
@@ -54,7 +54,6 @@ EOF


	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o REPOS_DIR="${TMPDIR}" -o METALOG=${TMPDIR}/METALOG -r ${TMPDIR}/root install -y test
@@ -101,7 +100,6 @@ EOF


	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o REPOS_DIR="${TMPDIR}" install -y test

}
modified tests/frontend/issue1374.sh
@@ -137,7 +137,6 @@ EOF


        atf_check \

                -o ignore \
- 
		-e match:".*load error: access repo file.*" \

                -s exit:0 \

                pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y foo
modified tests/frontend/issue1425.sh
@@ -183,7 +183,6 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done


        atf_check \

                -o inline:"${OUTPUT_CASE1}" \
- 
                -e match:".*load error: access repo file.*" \

                -s exit:0 \

                pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA
modified tests/frontend/issue1440.sh
@@ -218,7 +218,6 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done


        atf_check \

                -o inline:"${OUTPUT_CASE1}" \
- 
                -e match:".*load error: access repo file.*" \

                -s exit:0 \

                pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA
modified tests/frontend/jpeg.sh
@@ -138,7 +138,6 @@ local: {
EOF

	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y

}
modified tests/frontend/messages.sh
@@ -56,7 +56,6 @@ EOF
	atf_check -o ignore pkg create -M test.ucl

	atf_check -o ignore pkg repo .

	atf_check -o match:"^Upgrading from lower than 1.0.*" \
- 
	    -e match:".*load error: access repo file.*" \

	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y

	atf_check -o ignore pkg delete -y test
modified tests/frontend/multipleprovider.sh
@@ -95,7 +95,6 @@ EOF


	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y

}
modified tests/frontend/packagemerge.sh
@@ -108,7 +108,6 @@ EOF


	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
modified tests/frontend/packagesplit.sh
@@ -85,7 +85,6 @@ local: {
EOF

	atf_check \

	    -o ignore \
- 
	    -e match:".*load error: access repo file.*" \

	    -s exit:0 \

	    pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
modified tests/frontend/php-pr.sh
@@ -104,7 +104,6 @@ EOF


	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y php53-extensions
@@ -264,7 +263,6 @@ Number of packages to be reinstalled: 1


	atf_check \

		-o inline:"${OUTPUT}" \
- 
		-e match:".*load error: access repo file.*" \

		-s exit:1 \

		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -n php53-fileinfo
modified tests/frontend/pubkey.sh
@@ -42,7 +42,6 @@ local: {
EOF

	atf_check \

		-o ignore \
- 
		-e match:".*load error: access repo file.*" \

		pkg -o REPOS_DIR="${TMPDIR}" \

		-o ${PKG_CACHEDIR}="${TMPDIR}" update

}
modified tests/frontend/repo.sh
@@ -78,7 +78,6 @@ repositories: {
EOF



	atf_check -o ignore \
- 
		-e match:".*load error: access repo file.*" \

		pkg -C ./pkg.conf update



	# Ensure we can pickup the old version
modified tests/frontend/requires.sh
@@ -54,7 +54,6 @@ Number of packages to be installed: 2
"

	atf_check \

	    -o inline:"${OUTPUT}" \
- 
	    -e match:".*load error: access repo file.*" \

	    -s exit:1 \

	    pkg -o REPOS_DIR="${TMPDIR}" install -n b

}
modified tests/frontend/rubypuppet.sh
@@ -116,7 +116,6 @@ EOF


	atf_check \

	    -o ignore \
- 
	    -e match:".*load error: access repo file.*" \

	    -s exit:0 \

	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y puppet
@@ -259,7 +258,6 @@ Number of packages to be reinstalled: 3


	atf_check \

	    -o inline:"${OUTPUT}" \
- 
	    -e match:".*load error: access repo file.*" \

	    -s exit:1 \

	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -yn

}