diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2018-09-15 17:45:16 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2018-09-15 17:45:16 +0200 |
| commit | 32e0587d1819ca4b09cd146b0114a1c56ce4a8a9 (patch) | |
| tree | 8773f651557f6e2306d5510dd0dcff6bb7b4e79c /test | |
| parent | a5953d914488c80c28fba6b59d2f0be461cd9f03 (diff) | |
Show all architectures in 'apt list' output
The uniqueness in std::set containers is ensured by the ordering
operator we provide, but it was not considering that different versions
can have the same description like the different architectures for a
version of a package.
Closes: #908218
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-cli-list | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list index 8928a4856..3a9ca2c15 100755 --- a/test/integration/test-apt-cli-list +++ b/test/integration/test-apt-cli-list @@ -5,7 +5,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" . "$TESTDIR/framework" setupenvironment -configarchitecture "i386" +configarchitecture 'i386' 'armel' insertpackage 'unstable' 'foo' 'all' '1.0' insertinstalledpackage 'bar' 'i386' '1.0' @@ -17,6 +17,10 @@ insertinstalledpackage 'baz' 'all' '0.1' insertpackage 'testing' 'baz' 'all' '1.0' insertpackage 'unstable' 'baz' 'all' '2.0' +insertinstalledpackage 'foreign' 'armel' '1.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'foreign' 'i386,armel' '2.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'lib' 'i386,armel' '2.0' 'Multi-Arch: same' + setupaptarchive testsuccessequal "Listing... @@ -24,7 +28,11 @@ bar/now 1.0 i386 [installed,local] baz/unstable 2.0 all [upgradable from: 0.1] dpkg/now 1.16.2+fake all [installed,local] foo/unstable 1.0 all -foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list +foobar/unstable 2.0 i386 [upgradable from: 1.0] +foreign/unstable 2.0 armel [upgradable from: 1.0] +foreign/unstable 2.0 i386 +lib/unstable 2.0 armel +lib/unstable 2.0 i386" apt list testsuccessequal "Listing... foo/unstable 1.0 all @@ -32,7 +40,8 @@ foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list "foo*" testsuccessequal "Listing... baz/unstable 2.0 all [upgradable from: 0.1] -foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable +foobar/unstable 2.0 i386 [upgradable from: 1.0] +foreign/unstable 2.0 armel [upgradable from: 1.0]" apt list --upgradable # FIXME: hm, hm - does it make sense to have this different? shouldn't # we use "installed,upgradable" consistently? @@ -40,7 +49,8 @@ testsuccessequal "Listing... bar/now 1.0 i386 [installed,local] baz/now 0.1 all [installed,upgradable to: 2.0] dpkg/now 1.16.2+fake all [installed,local] -foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed +foobar/now 1.0 i386 [installed,upgradable to: 2.0] +foreign/now 1.0 armel [installed,upgradable to: 2.0]" apt list --installed testsuccessequal "Listing... bar/now 1.0 i386 [installed,local] @@ -72,3 +82,12 @@ baz/now 0.1 all [installed,upgradable to: 2.0] # test format strings for machine parseable output testsuccessequal 'bar - 1.0 - 1.0 baz - 0.1 - 2.0' apt list -qq bar baz -o APT::Cmd::use-format=true -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}" + + +insertinstalledpackage 'lib' 'i386,armel' '1.0' 'Multi-Arch: same' +testsuccessequal 'Listing... +baz/unstable 2.0 all [upgradable from: 0.1] +foobar/unstable 2.0 i386 [upgradable from: 1.0] +foreign/unstable 2.0 armel [upgradable from: 1.0] +lib/unstable 2.0 armel [upgradable from: 1.0] +lib/unstable 2.0 i386 [upgradable from: 1.0]' apt list --upgradeable |