summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-09-10 21:10:17 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-09-14 15:22:18 +0200
commit90b56f542e0ae722c843265f4e6250cc0a096f5d (patch)
treefb7de3ac37e39becd4d67e2f7646b03a06af6483 /test/integration
parent95278287f4e1eeaf5d96749d6fc9bfc53fb400d0 (diff)
tests: use more 'native' instead of 'amd64' if possible
The tests usually run on amd64 boxes, but once in a while I run it on a (slow) armel box as well, which has its fair share of problems with some tests, but at least the low hanging fruits can be dealt with: Do not assume that amd64 is the native dpkg architecture – instead use whatever dpkg thinks is native as architecture for the test. Git-Dch: Ignore
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-move-and-forget-manual-sections8
-rwxr-xr-xtest/integration/test-apt-progress-fd-error18
-rwxr-xr-xtest/integration/test-apt-update-ims2
3 files changed, 11 insertions, 17 deletions
diff --git a/test/integration/test-apt-move-and-forget-manual-sections b/test/integration/test-apt-move-and-forget-manual-sections
index 845444f53..af9143dda 100755
--- a/test/integration/test-apt-move-and-forget-manual-sections
+++ b/test/integration/test-apt-move-and-forget-manual-sections
@@ -4,14 +4,14 @@ set -e
TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture 'amd64'
+configarchitecture 'native'
aptconfig dump --no-empty --format '%v%n' APT::Move-Autobit-Sections > move-autobit.sections
testsuccess grep '^oldlibs$' move-autobit.sections
-buildsimplenativepackage 'libabc' 'amd64' '1' 'stable' '' '' 'libs'
-buildsimplenativepackage 'libabc' 'amd64' '2' 'unstable' 'Depends: libdef' '' 'oldlibs'
-buildsimplenativepackage 'libdef' 'amd64' '1' 'unstable' '' '' 'libs'
+buildsimplenativepackage 'libabc' 'native' '1' 'stable' '' '' 'libs'
+buildsimplenativepackage 'libabc' 'native' '2' 'unstable' 'Depends: libdef' '' 'oldlibs'
+buildsimplenativepackage 'libdef' 'native' '1' 'unstable' '' '' 'libs'
setupaptarchive
testmarkedauto
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error
index 632300765..ccbb000c7 100755
--- a/test/integration/test-apt-progress-fd-error
+++ b/test/integration/test-apt-progress-fd-error
@@ -5,23 +5,17 @@ TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture 'amd64' 'i386'
+configarchitecture 'native'
mkdir -p usr/bin
touch usr/bin/file-conflict
-buildsimplenativepackage 'foo1' 'amd64,i386' '0.8.15' 'stable' '' 'pkg with file conflicts' '' '' 'usr/'
-buildsimplenativepackage 'foo2' 'amd64,i386' '0.8.15' 'stable' '' 'pkg with file conflicts' '' '' 'usr/'
+buildsimplenativepackage 'foo1' 'native' '0.8.15' 'stable' '' 'pkg with file conflicts' '' '' 'usr/'
+buildsimplenativepackage 'foo2' 'native' '0.8.15' 'stable' '' 'pkg with file conflicts' '' '' 'usr/'
-setupaptarchive
+setupaptarchive
exec 3> apt-progress.log
testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3
-msgtest "Ensure correct error message"
-if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then
- msgpass
-else
- cat apt-progress.log
- msgfail
-fi
-
+msgtest 'Ensure correct error message'
+testsuccess --nomsg grep "aptarchive/pool/foo2_0.8.15_[^.]\+.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index ed89cd342..80ef28093 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -25,7 +25,7 @@ runtest() {
$TEST aptget update
if [ "$1" = 'failure' ]; then
# accept the outdated Release file so we can check Hit behaviour
- "test${2:-success}" aptget update -o Acquire::Min-ValidTime=99999999999
+ "test${2:-success}" aptget update -o Acquire::Min-ValidTime=9999999
fi
listcurrentlistsdirectory > listsdir.lst
testsuccess grep '_Packages\(\.gz\)\?$' listsdir.lst