summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-08-14 01:18:11 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-08-14 01:18:11 +0200
commit4bec02c237e8e218bc7d4bcf7142e0450480138b (patch)
treec82cda068c389b4c48e9ecef5d55304023a1cdbb
parent7d0627b62aa24b970f18d52be8576c314556b680 (diff)
fix testcase framework to test correctly for virtual packages
-rw-r--r--test/integration/framework8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/framework b/test/integration/framework
index f01bb989b..5e6c5427f 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -73,7 +73,7 @@ setupenvironment() {
if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
else
- touch var/lib/dpkg/status
+ touch aptarchive/Packages
fi
echo "RootDir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
echo "Debug::NoLocking \"true\";" >> aptconfig.conf
@@ -172,18 +172,18 @@ testequalor2() {
}
testshowvirtual() {
- local VIRTUAL="E: Can't select versions from package '$1' as it purely virtual"
+ local VIRTUAL="N: Can't select versions from package '$1' as it purely virtual"
local PACKAGE="$1"
shift
while [ -n "$1" ]; do
VIRTUAL="${VIRTUAL}
-E: Can't select versions from package '$1' as it purely virtual"
+N: Can't select versions from package '$1' as it purely virtual"
PACKAGE="${PACKAGE} $1"
shift
done
msgtest "Test for virtual packages" "apt-cache show $PACKAGE"
VIRTUAL="${VIRTUAL}
-E: No packages found"
+N: No packages found"
local COMPAREFILE=$(mktemp)
local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU)
eval `apt-config shell ARCH APT::Architecture`