瀏覽代碼

now that stdout/stdlog are used consistently, the message order changed

David Kalnischkies 14 年之前
父節點
當前提交
9a3798e6d5
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      test/integration/test-conflicts-loop

+ 1 - 1
test/integration/test-conflicts-loop

@@ -19,10 +19,10 @@ testequal 'Reading package lists...
 Building dependency tree...
 Building dependency tree...
 The following packages will be upgraded:
 The following packages will be upgraded:
   openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
   openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
-3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
   openjdk-6-jre-lib:i386 conflicts with openjdk-6-jre:i386
   openjdk-6-jre-lib:i386 conflicts with openjdk-6-jre:i386
     openjdk-6-jre:i386 conflicts with openjdk-6-jre-headless:i386
     openjdk-6-jre:i386 conflicts with openjdk-6-jre-headless:i386
       openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre:i386
       openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre:i386
+3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
 Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
       openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386
       openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386
 Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]
 Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]