add an additional test for arch specific conflicts

[apt.git] / test / integration / test-disappearing-packages

diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index 82ba9e59201957673fffe65561533becb7d833d2..3b1e1bd7cd9b5bb9cd0143a6d0deaf9357e61cea 100755 (executable)
--- 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
 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"
 
 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"
 Replaces: old-pkg
 Conflicts: old-pkg (<< 2.0)"
 BUILDDIR="incoming/new-pkg-2.0"


@@ -29,7 +29,7 @@ rm -rf "$BUILDDIR"
 
 setupaptarchive
 
 
 setupaptarchive
 

-aptget install old-pkg=1.0 --trivial-only -qq 2>&1 > /dev/null
+testsuccess aptget install old-pkg=1.0 --trivial-only

 
 testmarkedauto # old-pkg is manual installed
 
 
 testmarkedauto # old-pkg is manual installed
 


@@ -39,16 +39,16 @@ COMPAREFILE=$(mktemp)
 echo "The following package disappeared from your system as
 all files have been overwritten by other packages:
   old-pkg
 echo "The following package disappeared from your system as
 all files have been overwritten by other packages:
   old-pkg

-Note: This is done automatic and on purpose by dpkg." > $COMPAREFILE
-$CMD 2>&1 | tail -n 4 | diff $COMPAREFILE - && msgpass || msgfail
+Note: This is done automatically and on purpose by dpkg." > $COMPAREFILE
+$CMD 2>&1 | tail -n 4 | diff -u $COMPAREFILE - && msgpass || msgfail

 rm $COMPAREFILE
 
 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" "
 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
 Disappeared: old-pkg (1.0)"
 
 testmarkedauto  # new-pkg should have get the manual flag from old-pkg