test-apt-download-progress: Allow smaller progress change

[apt.git] / test / integration / test-bug-673536-pre-depends-breaks-loop

diff --git a/test/integration/test-bug-673536-pre-depends-breaks-loop b/test/integration/test-bug-673536-pre-depends-breaks-loop
index f6a90b21f6097e40237025939f981e5888540ce9..eb47553dcd8da71e9a7b27ab9c1f886d14d3e14e 100755 (executable)
--- a/test/integration/test-bug-673536-pre-depends-breaks-loop
+++ b/test/integration/test-bug-673536-pre-depends-breaks-loop
@@ -6,18 +6,31 @@ TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment
 configarchitecture 'native'
 
 setupenvironment
 configarchitecture 'native'
 

-buildsimplenativepackage 'basic' 'native' '1' 'stable'
+buildsimplenativepackage 'advanced' 'native' '1' 'stable'
+buildsimplenativepackage 'advanced' 'native' '2' 'unstable' 'Pre-Depends: basic'

 buildsimplenativepackage 'basic' 'native' '2' 'unstable' 'Pre-Depends: common'
 buildsimplenativepackage 'basic' 'native' '2' 'unstable' 'Pre-Depends: common'

-buildsimplenativepackage 'common' 'native' '2' 'unstable' 'Breaks: basic (<= 1)'
+
+buildsimplenativepackage 'common' 'native' '2~conflict' 'unstable-conflict' 'Conflicts: advanced (<= 1)'
+buildsimplenativepackage 'common' 'native' '2~break' 'unstable-break' 'Conflicts: advanced (<= 1)'

 
 setupaptarchive
 
 # we check with 'real' packages here as the simulation reports a 'Conf broken'
 # which is technical correct for the simulation, but testing errormsg is ugly
 
 
 setupaptarchive
 
 # we check with 'real' packages here as the simulation reports a 'Conf broken'
 # which is technical correct for the simulation, but testing errormsg is ugly
 

-testsuccess aptget install basic=1 -y
-testdpkginstalled basic
-testdpkgnotinstalled common
+cp -a rootdir/var/lib/dpkg/status dpkg.status.backup
+
+testloopbreak() {
+       cp -a dpkg.status.backup rootdir/var/lib/dpkg/status
+       rm -f rootdir/var/lib/apt/extended_states
+
+       testsuccess aptget install advanced=1 -y -t "$1"
+       testdpkginstalled advanced
+       testdpkgnotinstalled basic common
+
+       testsuccess aptget dist-upgrade -y -t "$1"
+       testdpkginstalled advanced basic common
+}

 
 

-testsuccess aptget dist-upgrade -y
-testdpkginstalled basic common
+testloopbreak 'unstable-break'
+testloopbreak 'unstable-conflict'