Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5259e83
adjust tests
Andrej Zverev committed 9 years ago
commit 5259e838b1304ad5dab5f4057dbae336f9f52d68
parent c04574d
18 files changed +29 -19
modified tests/frontend/autoupgrade.sh
@@ -63,7 +63,7 @@ EOF


	atf_check \

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

		-s exit:1 \

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

}
@@ -148,13 +148,13 @@ EOF
	export REPOS_DIR="${TMPDIR}"

	atf_check \

		-o ignore \
- 
		-e empty \
+ 
		-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 empty \
+ 
		-e match:".*load error: access repo file.*" \

		-s exit:0 \

		pkg upgrade -y
modified tests/frontend/configmerge.sh
@@ -39,6 +39,7 @@ 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 \
@@ -76,6 +77,7 @@ 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"
@@ -97,6 +99,7 @@ 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"
modified tests/frontend/conflicts-multirepo.sh
@@ -178,7 +178,7 @@ ${JAILED}[2/2] Extracting test-1.1: done
"

	atf_check \

		-o inline:"${OUTPUT}" \
- 
		-e empty \
+ 
		-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
@@ -94,7 +94,7 @@ ${JAILED}[2/2] Extracting test2-1: done
"

	atf_check \

		-o inline:"${OUTPUT}" \
- 
		-e empty \
+ 
		-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/install.sh
@@ -52,7 +52,7 @@ EOF


	atf_check \

		-o ignore \
- 
		-e empty \
+ 
		-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
@@ -99,7 +99,7 @@ EOF


	atf_check \

		-o ignore \
- 
		-e empty \
+ 
		-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,7 @@ EOF


        atf_check \

                -o ignore \
- 
                -e empty \
+ 
		-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,7 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done


        atf_check \

                -o inline:"${OUTPUT_CASE1}" \
- 
                -e empty \
+ 
                -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,7 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done


        atf_check \

                -o inline:"${OUTPUT_CASE1}" \
- 
                -e empty \
+ 
                -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
@@ -136,5 +136,9 @@ local: {
	enabled: true

}

EOF
- 
	atf_check -o ignore -e empty -s exit:0 pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
+ 
	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,6 +56,7 @@ 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
@@ -145,7 +145,7 @@ EOF


	atf_check \

		-o ignore \
- 
		-e empty \
+ 
		-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
@@ -178,7 +178,7 @@ EOF


	atf_check \

		-o ignore \
- 
		-e empty \
+ 
		-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
@@ -135,7 +135,7 @@ local: {
EOF

	atf_check \

	    -o ignore \
- 
	    -e empty \
+ 
	    -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,7 @@ EOF


	atf_check \

		-o ignore \
- 
		-e empty \
+ 
		-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 +264,7 @@ Number of packages to be reinstalled: 1


	atf_check \

		-o inline:"${OUTPUT}" \
- 
		-e empty \
+ 
		-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,6 +42,7 @@ 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
@@ -111,6 +111,7 @@ 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
@@ -73,7 +73,7 @@ Number of packages to be installed: 2
"

	atf_check \

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

	    -s exit:1 \

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

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


	atf_check \

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

	    -s exit:0 \

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


	atf_check \

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

	    -s exit:1 \

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

}