diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-move-and-forget-manual-sections | 8 | ||||
| -rwxr-xr-x | test/integration/test-apt-progress-fd-error | 18 | ||||
| -rwxr-xr-x | test/integration/test-apt-update-ims | 2 |
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 |