respect --keyring also in merged keyring commands

[apt.git] / test / integration / test-conflicts-loop

diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
index a2c411aafacb112130f54728dca719690e69706b..0906ef8fa4d4c8db2e7fd5022ceb89c5082445e7 100755 (executable)
--- a/test/integration/test-conflicts-loop
+++ b/test/integration/test-conflicts-loop
@@ -17,6 +17,7 @@ setupaptarchive
 
 testequal 'Reading package lists...
 Building dependency tree...
 
 testequal 'Reading package lists...
 Building dependency tree...

+Calculating upgrade...

 The following packages will be upgraded:
   openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 The following packages will be upgraded:
   openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.