diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-17 08:03:41 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-17 08:03:41 +0200 |
| commit | e8022b09e73ee89d3b748e1c8dba82abba5b37f3 (patch) | |
| tree | 2bc51615c21c16040dbb31ebf873bdd2a29565d0 /test/integration/test-apt-progress-fd-error | |
| parent | 5e9458e285af11c7fa4308add10d250e3546c8bf (diff) | |
| parent | c420fe0096985234e861aaafc2b9908b6259a1bb (diff) | |
Merge branch 'debian/sid' into feature/install-progress-refactor
Conflicts:
apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'test/integration/test-apt-progress-fd-error')
| -rwxr-xr-x | test/integration/test-apt-progress-fd-error | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error new file mode 100755 index 000000000..0cd59410e --- /dev/null +++ b/test/integration/test-apt-progress-fd-error @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'amd64' 'i386' + +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/' + +setupaptarchive + +exec 3> apt-progress.log +testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3 +msgtest "Ensure correct error message" +grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb :40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log && msgpass || msgfail + |