From 87d6947d51717e8b0e975d913986161598a7259a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 19 Nov 2015 16:00:33 +0100 Subject: tests: use quiet level 0 by default in tests Git-Dch: Ignore --- .../test-bug-612099-multiarch-conflicts | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'test/integration/test-bug-612099-multiarch-conflicts') diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts index af8391555..11ec284c4 100755 --- a/test/integration/test-bug-612099-multiarch-conflicts +++ b/test/integration/test-bug-612099-multiarch-conflicts @@ -54,9 +54,10 @@ Inst foobar:amd64 (1.0 stable [amd64]) Conf libc6:amd64 (1.0 stable [amd64]) Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64 -st stable -testsuccessequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [i386]) for 'foobar' The following NEW packages will be installed: foobar The following packages will be upgraded: @@ -65,7 +66,7 @@ The following packages will be upgraded: Inst libc6 [1.0] (2.0 testing [all]) Inst foobar (1.0 stable [i386]) Conf libc6 (2.0 testing [all]) -Conf foobar (1.0 stable [i386])' aptget install foobar/stable libc6 -st testing +Conf foobar (1.0 stable [i386])" aptget install foobar/stable libc6 -st testing testsuccessequal 'Reading package lists... Building dependency tree... @@ -84,18 +85,20 @@ testsuccess aptget purge libc6 -y testsuccess aptget install libc6:i386 -y testdpkginstalled libc6:all -testsuccessequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [i386]) for 'foobar' The following NEW packages will be installed: foobar 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Inst foobar (1.0 stable [i386]) -Conf foobar (1.0 stable [i386])' aptget install foobar/stable -st testing +Conf foobar (1.0 stable [i386])" aptget install foobar/stable -st testing -testsuccessequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [amd64]) for 'foobar:amd64' The following additional packages will be installed: libc6:amd64 The following packages will be REMOVED: @@ -107,7 +110,7 @@ Remv libc6 [2.0] Inst libc6:amd64 (1.0 stable [amd64]) Inst foobar:amd64 (1.0 stable [amd64]) Conf libc6:amd64 (1.0 stable [amd64]) -Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64/stable -st testing +Conf foobar:amd64 (1.0 stable [amd64])" aptget install foobar:amd64/stable -st testing testsuccessequal "Reading package lists... @@ -118,7 +121,7 @@ The following packages will be DOWNGRADED: libc6 0 upgraded, 0 newly installed, 1 downgraded, 0 to remove and 0 not upgraded. Inst libc6 [2.0] (1.0 stable [i386]) -Conf libc6 (1.0 stable [i386])" aptget install libc6/stable -s -q=0 +Conf libc6 (1.0 stable [i386])" aptget install libc6/stable -s buildsimplenativepackage 'libc6-same' 'i386' '1.0' 'stable' 'Multi-Arch: same' @@ -192,20 +195,22 @@ The following packages will be DOWNGRADED: libc6-same 0 upgraded, 0 newly installed, 1 downgraded, 0 to remove and 0 not upgraded. Inst libc6-same [2.0] (1.0 stable [i386]) -Conf libc6-same (1.0 stable [i386])" aptget install libc6-same/stable -s -q=0 +Conf libc6-same (1.0 stable [i386])" aptget install libc6-same/stable -s -testsuccessequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [i386]) for 'foobar-same' The following NEW packages will be installed: foobar-same 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Inst foobar-same (1.0 stable [i386]) -Conf foobar-same (1.0 stable [i386])' aptget install foobar-same/stable -st testing +Conf foobar-same (1.0 stable [i386])" aptget install foobar-same/stable -st testing -testsuccessequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [amd64]) for 'foobar-same:amd64' The following additional packages will be installed: libc6-same:amd64 The following packages will be REMOVED: @@ -217,4 +222,4 @@ Remv libc6-same [2.0] Inst libc6-same:amd64 (1.0 stable [amd64]) Inst foobar-same:amd64 (1.0 stable [amd64]) Conf libc6-same:amd64 (1.0 stable [amd64]) -Conf foobar-same:amd64 (1.0 stable [amd64])' aptget install foobar-same:amd64/stable -st testing +Conf foobar-same:amd64 (1.0 stable [amd64])" aptget install foobar-same:amd64/stable -st testing -- cgit v1.2.3