From 14bed2c0108a99d68f453ff61273d5ae59a5c3f0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 3 Jun 2016 14:40:06 +0200 Subject: eipp: properly handle arch-specific provides The generation of the EIPP request was a bit to strict not generation what would actually be needed to be part of the scenario. --- .../test-specific-architecture-dependencies | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'test/integration/test-specific-architecture-dependencies') diff --git a/test/integration/test-specific-architecture-dependencies b/test/integration/test-specific-architecture-dependencies index 959555619..447e407e5 100755 --- a/test/integration/test-specific-architecture-dependencies +++ b/test/integration/test-specific-architecture-dependencies @@ -69,7 +69,7 @@ Inst depender-x32:i386 (1 unstable [i386]) Conf libc6:i386 (1 unstable [i386]) Conf depender-x32:i386 (1 unstable [i386])' aptget install depender-x32:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following additional packages will be installed: libc6:i386 @@ -81,7 +81,7 @@ Inst depender-x32 (1 unstable [amd64]) Conf libc6:i386 (1 unstable [i386]) Conf depender-x32 (1 unstable [amd64])' aptget install depender-x32:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following additional packages will be installed: libc6 @@ -93,7 +93,7 @@ Inst depender-x64 (1 unstable [amd64]) Conf libc6 (1 unstable [amd64]) Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following additional packages will be installed: libc6 @@ -105,7 +105,7 @@ Inst depender-x64:i386 (1 unstable [i386]) Conf libc6 (1 unstable [amd64]) Conf depender-x64:i386 (1 unstable [i386])' aptget install depender-x64:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold:i386 libold @@ -128,7 +128,7 @@ Remv libold:i386 [1] Inst breaker-x32 (1 unstable [amd64]) Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold:i386 @@ -139,7 +139,7 @@ Remv libold:i386 [1] Inst breaker-x32:i386 (1 unstable [i386]) Conf breaker-x32:i386 (1 unstable [i386])' aptget install breaker-x32:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold @@ -213,7 +213,7 @@ The following NEW packages will be installed: Inst foo-native-depender (1 unstable [amd64]) Conf foo-native-depender (1 unstable [amd64])' aptget install foo-native-depender -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: foo-foreign-depender:i386 @@ -265,7 +265,7 @@ Conf foo-no-conflictor:i386 (1 unstable [i386])' aptget install foo-no-conflicto msgmsg 'switch to single architecture' configarchitecture 'amd64' -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following additional packages will be installed: libc6 @@ -277,11 +277,11 @@ Inst depender-x64 (1 unstable [amd64]) Conf libc6 (1 unstable [amd64]) Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64 -s -testequal 'Reading package lists... +testfailureequal 'Reading package lists... Building dependency tree... E: Unable to locate package depender-x64:i386' aptget install depender-x64:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: foo-native-depender @@ -289,7 +289,7 @@ The following NEW packages will be installed: Inst foo-native-depender (1 unstable [amd64]) Conf foo-native-depender (1 unstable [amd64])' aptget install foo-native-depender -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold:i386 @@ -300,7 +300,7 @@ Remv libold:i386 [1] Inst breaker-x32 (1 unstable [amd64]) Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold @@ -311,7 +311,7 @@ Remv libold [1] Inst breaker-x64 (1 unstable [amd64]) Conf breaker-x64 (1 unstable [amd64])' aptget install breaker-x64:amd64 -s -testequal 'Reading package lists... +testfailureequal 'Reading package lists... Building dependency tree... Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable -- cgit v1.2.3