Run ./prepare-release pre-export

[apt.git] / test / integration / test-ignore-provides-if-versioned-conflicts

diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts
index 44eafcff108fee4ea16bcf3ef58803a796e76342..f30789ea660ed26095b0006e7a334a2c2ec6e062 100755 (executable)
--- a/test/integration/test-ignore-provides-if-versioned-conflicts
+++ b/test/integration/test-ignore-provides-if-versioned-conflicts
@@ -33,7 +33,7 @@ insertpackage 'unstable' 'foo-same-breaker-none' 'i386' '1.0' 'Conflicts: foo-sa
 
 setupaptarchive
 
 
 setupaptarchive
 

-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
 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


@@ -45,7 +45,7 @@ The following packages have unmet dependencies:
  foo-breaker-none : Conflicts: foo
 E: Unable to correct problems, you have held broken packages.' aptget install foo-provider foo-breaker-none -s
 
  foo-breaker-none : Conflicts: foo
 E: Unable to correct problems, you have held broken packages.' aptget install foo-provider foo-breaker-none -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo-breaker-2 foo-provider
 Building dependency tree...
 The following NEW packages will be installed:
   foo-breaker-2 foo-provider


@@ -55,9 +55,9 @@ Inst foo-provider (1.0 unstable [i386])
 Conf foo-breaker-2 (1.0 unstable [i386])
 Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-2 -s
 
 Conf foo-breaker-2 (1.0 unstable [i386])
 Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-2 -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo
 The following NEW packages will be installed:
   foo-breaker-3 foo-provider
   foo
 The following NEW packages will be installed:
   foo-breaker-3 foo-provider


@@ -71,7 +71,7 @@ Conf foo (4.0 unstable [i386])
 Conf foo-breaker-3 (1.0 unstable [i386])
 Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-3 -s
 
 Conf foo-breaker-3 (1.0 unstable [i386])
 Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-3 -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
 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


@@ -83,7 +83,7 @@ The following packages have unmet dependencies:
  foo-foreign-breaker-none : Conflicts: foo-foreign
 E: Unable to correct problems, you have held broken packages.' aptget install foo-foreign-provider foo-foreign-breaker-none -s
 
  foo-foreign-breaker-none : Conflicts: foo-foreign
 E: Unable to correct problems, you have held broken packages.' aptget install foo-foreign-provider foo-foreign-breaker-none -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo-foreign-breaker-2 foo-foreign-provider
 Building dependency tree...
 The following NEW packages will be installed:
   foo-foreign-breaker-2 foo-foreign-provider


@@ -93,9 +93,9 @@ Inst foo-foreign-provider (1.0 unstable [i386])
 Conf foo-foreign-breaker-2 (1.0 unstable [i386])
 Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-2 -s
 
 Conf foo-foreign-breaker-2 (1.0 unstable [i386])
 Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-2 -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo-foreign:amd64
 The following NEW packages will be installed:
   foo-foreign-breaker-3 foo-foreign-provider
   foo-foreign:amd64
 The following NEW packages will be installed:
   foo-foreign-breaker-3 foo-foreign-provider


@@ -109,7 +109,7 @@ Conf foo-foreign:amd64 (4.0 unstable [amd64])
 Conf foo-foreign-breaker-3 (1.0 unstable [i386])
 Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-3 -s
 
 Conf foo-foreign-breaker-3 (1.0 unstable [i386])
 Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-3 -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
 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


@@ -121,7 +121,7 @@ The following packages have unmet dependencies:
  foo-same-breaker-none : Conflicts: foo-same
 E: Unable to correct problems, you have held broken packages.' aptget install foo-same-provider foo-same-breaker-none -s
 
  foo-same-breaker-none : Conflicts: foo-same
 E: Unable to correct problems, you have held broken packages.' aptget install foo-same-provider foo-same-breaker-none -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo-same-breaker-2 foo-same-provider
 Building dependency tree...
 The following NEW packages will be installed:
   foo-same-breaker-2 foo-same-provider


@@ -131,20 +131,20 @@ Inst foo-same-provider (1.0 unstable [i386])
 Conf foo-same-breaker-2 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-2 -s
 
 Conf foo-same-breaker-2 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-2 -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

-The following extra packages will be installed:
-  foo-same:amd64 foo-same
+The following additional packages will be installed:
+  foo-same foo-same:amd64

 The following NEW packages will be installed:
   foo-same-breaker-3 foo-same-provider
 The following packages will be upgraded:
 The following NEW packages will be installed:
   foo-same-breaker-3 foo-same-provider
 The following packages will be upgraded:

-  foo-same:amd64 foo-same
+  foo-same foo-same:amd64

 2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
 2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.

-Inst foo-same:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386 ]
-Inst foo-same [2.0] (4.0 unstable [i386])
-Conf foo-same:amd64 (4.0 unstable [amd64])
-Conf foo-same (4.0 unstable [i386])
+Inst foo-same [2.0] (4.0 unstable [i386]) [foo-same:i386 on foo-same:amd64] [foo-same:amd64 on foo-same:i386] [foo-same:amd64 ]
+Inst foo-same:amd64 [2.0] (4.0 unstable [amd64])

 Inst foo-same-breaker-3 (1.0 unstable [i386])
 Inst foo-same-provider (1.0 unstable [i386])
 Inst foo-same-breaker-3 (1.0 unstable [i386])
 Inst foo-same-provider (1.0 unstable [i386])

+Conf foo-same:amd64 (4.0 unstable [amd64])
+Conf foo-same (4.0 unstable [i386])

 Conf foo-same-breaker-3 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s
 Conf foo-same-breaker-3 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s