fb4fc5b test: avoid pollution from installed pkg settings — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

test: avoid pollution from installed pkg settings

Baptiste Daroussin committed 11 months ago

commit fb4fc5b273d13471257b9fe89ece58b114338a58
parent 243fe27

1 file changed +10 -4

modified tests/frontend/conflicts.sh

@@ -509,11 +509,17 @@ EOF

 	atf_check \
 		pkg create -M testb.ucl -p plist
 	pkg repo .
 	mkdir reposconf
 	mkdir target
 	echo "local: { url: file://${TMPDIR} }" > reposconf/local.conf
 	mkdir reposconf
 	cat << EOF >> reposconf/repo.conf
 local: {
 	url: file:///${TMPDIR},
 	enabled: true
 }
 EOF
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target install -qy testb
 		pkg -C /dev/null -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" -r ${TMPDIR}/target install -qy testb
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "testa-lib" "testa-lib" "2.0"
 	echo "entry" > a
 	echo "${TMPDIR}/a" > plist

@@ -583,5 +589,5 @@ ${JAILED}[3/3] Extracting testa-lib-2.0: done

 "
 	atf_check \
 		-o inline:"${OUTPUT}" \
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target upgrade -y
 		pkg -C /dev/null -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" -r ${TMPDIR}/target upgrade -y
 }