Просмотр исходного кода

ignore the order used for the 'apt' package as long as it is valid either way

David Kalnischkies лет назад: 14
Родитель
Сommit
04d24dbdcc
1 измененных файлов с 15 добавлено и 1 удалено
  1. 15 1
      test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first

+ 15 - 1
test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first

@@ -14,7 +14,7 @@ insertpackage 'unstable' 'apt' 'i386' '2' 'Depends: libsame (= 2)'
 
 
 setupaptarchive
 setupaptarchive
 
 
-testequal 'Reading package lists...
+testequalor2 'Reading package lists...
 Building dependency tree...
 Building dependency tree...
 The following extra packages will be installed:
 The following extra packages will be installed:
   apt:i386 libsame:i386
   apt:i386 libsame:i386
@@ -28,4 +28,18 @@ Inst libsame (2 unstable [amd64]) [apt:i386 ]
 Conf libsame:i386 (2 unstable [i386]) [apt:i386 ]
 Conf libsame:i386 (2 unstable [i386]) [apt:i386 ]
 Conf libsame (2 unstable [amd64]) [apt:i386 ]
 Conf libsame (2 unstable [amd64]) [apt:i386 ]
 Inst apt:i386 [1] (2 unstable [i386])
 Inst apt:i386 [1] (2 unstable [i386])
+Conf apt:i386 (2 unstable [i386])' 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  apt:i386 libsame:i386
+The following NEW packages will be installed:
+  libsame
+The following packages will be upgraded:
+  apt:i386 libsame:i386
+2 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst apt:i386 [1] (2 unstable [i386]) []
+Inst libsame:i386 [1] (2 unstable [i386])
+Inst libsame (2 unstable [amd64])
+Conf libsame:i386 (2 unstable [i386])
+Conf libsame (2 unstable [amd64])
 Conf apt:i386 (2 unstable [i386])' aptget install libsame:amd64 -s
 Conf apt:i386 (2 unstable [i386])' aptget install libsame:amd64 -s