diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
| commit | 784e35e86293094bb5c1456c8f9c844df2a71f12 (patch) | |
| tree | 28073f068ca09c46c04a5ed9e047824f782b15ac /test/integration/test-apt-cli-upgrade | |
| parent | a84a4d2ab78c498d9797c07d463daec4095b37de (diff) | |
| parent | 28b4b983d95fa742a5431547285a748e8b856399 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'test/integration/test-apt-cli-upgrade')
| -rwxr-xr-x | test/integration/test-apt-cli-upgrade | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade index 163a55576..21ce69413 100755 --- a/test/integration/test-apt-cli-upgrade +++ b/test/integration/test-apt-cli-upgrade @@ -16,8 +16,7 @@ setupaptarchive APTARCHIVE=$(readlink -f ./aptarchive) # default is to allow new dependencies -testequal "Calculating upgrade... Done -The following NEW packages will be installed: +testequal "The following NEW packages will be installed: foo-new-dependency The following packages will be upgraded: foo @@ -28,7 +27,6 @@ Conf foo-new-dependency (2.0 unstable [all]) Conf foo (2.0 unstable [all])" apt upgrade -qq -s # ensure -testequal "Calculating upgrade... Done -The following packages have been kept back: +testequal "The following packages have been kept back: foo 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs |