diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-03-13 13:34:47 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-03-13 13:34:47 +0100 |
| commit | 9a3798e6d5c26ebdaf1f865f5117bbc995b69b76 (patch) | |
| tree | fdc410575c6f1f84e142269f9b7c3d9eae0aab63 /test/integration | |
| parent | 544cc111be38bd0a3dfc887da3a70610b3cabe9e (diff) | |
now that stdout/stdlog are used consistently, the message order changed
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-conflicts-loop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop index 25f005969..4407fbd9d 100755 --- a/test/integration/test-conflicts-loop +++ b/test/integration/test-conflicts-loop @@ -19,10 +19,10 @@ testequal 'Reading package lists... Building dependency tree... 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. 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-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] openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386 Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1] |