diff options
| author | Michael Vogt <egon@debian-devbox> | 2011-10-14 13:55:50 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2011-10-14 13:55:50 +0200 |
| commit | a1e68c33ac15be454984b00d62c7fc331bd0b32b (patch) | |
| tree | abf59def54f9df6bbf9aa380b1314364482d8b1c /test/integration/test-disappearing-packages | |
| parent | 7be8c02360bdb9bd7f59b087da874f88af2a7206 (diff) | |
| parent | 0e7c33134cd32410eb8b344c6b6577826238bbbc (diff) | |
merged lp:~donkult/apt/experimental
Diffstat (limited to 'test/integration/test-disappearing-packages')
| -rwxr-xr-x | test/integration/test-disappearing-packages | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages index 82ba9e592..0e0e9618d 100755 --- a/test/integration/test-disappearing-packages +++ b/test/integration/test-disappearing-packages @@ -4,12 +4,12 @@ set -e TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture "i386" +configarchitecture 'native' -buildsimplenativepackage "old-pkg" "i386" "1.0" "stable" +buildsimplenativepackage "old-pkg" "native" "1.0" "stable" buildsimplenativepackage "unrelated" "all" "0.5" "unstable" -setupsimplenativepackage "new-pkg" "i386" "2.0" "unstable" "Provides: old-pkg +setupsimplenativepackage "new-pkg" "native" "2.0" "unstable" "Provides: old-pkg Replaces: old-pkg Conflicts: old-pkg (<< 2.0)" BUILDDIR="incoming/new-pkg-2.0" @@ -43,12 +43,12 @@ Note: This is done automatic and on purpose by dpkg." > $COMPAREFILE $CMD 2>&1 | tail -n 4 | diff $COMPAREFILE - && msgpass || msgfail rm $COMPAREFILE -sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' +sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e "s#:$(getarchitecture 'native') #:native #" testfileequal "rootdir/var/log/apt/history.log" " -Install: old-pkg:i386 (1.0) +Install: old-pkg:native (1.0) -Install: new-pkg:i386 (2.0, automatic) -Upgrade: old-pkg:i386 (1.0, 2.0) +Install: new-pkg:native (2.0, automatic) +Upgrade: old-pkg:native (1.0, 2.0) Disappeared: old-pkg (1.0)" testmarkedauto # new-pkg should have get the manual flag from old-pkg |