diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
| commit | 21248c0f00ee71412dbadc6ebf84011cf974346d (patch) | |
| tree | 7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /test/integration/test-ignore-provides-if-versioned-conflicts | |
| parent | e5f34ad3b043abf033c1626eb8449b75955d6760 (diff) | |
| parent | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff) | |
Merge branch 'debian/experimental' into feature/srv-records
Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
Diffstat (limited to 'test/integration/test-ignore-provides-if-versioned-conflicts')
| -rwxr-xr-x | test/integration/test-ignore-provides-if-versioned-conflicts | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts index a07252768..a781d8e44 100755 --- 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 -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 @@ -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 -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: foo-breaker-2 foo-provider @@ -55,7 +55,7 @@ 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 -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following extra packages will be installed: foo @@ -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 -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 @@ -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 -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 @@ -93,7 +93,7 @@ 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 -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following extra packages will be installed: foo-foreign:amd64 @@ -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 -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 @@ -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 -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 @@ -131,7 +131,7 @@ 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 -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following extra packages will be installed: foo-same:amd64 foo-same |