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-bug-675449-essential-are-protected | |
| 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-bug-675449-essential-are-protected')
| -rwxr-xr-x | test/integration/test-bug-675449-essential-are-protected | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/integration/test-bug-675449-essential-are-protected b/test/integration/test-bug-675449-essential-are-protected index 7d8cc3484..f50507532 100755 --- a/test/integration/test-bug-675449-essential-are-protected +++ b/test/integration/test-bug-675449-essential-are-protected @@ -27,7 +27,7 @@ insertpackage 'unstable' 'pkg-depends-new' 'amd64,i386' '2' 'Essential: yes' setupaptarchive -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: pkg-native* @@ -37,7 +37,7 @@ This should NOT be done unless you know exactly what you are doing! 0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. Purg pkg-native [1]' aptget purge pkg-native -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: pkg-foreign:i386* @@ -47,7 +47,7 @@ This should NOT be done unless you know exactly what you are doing! 0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. Purg pkg-foreign:i386 [1]' aptget purge pkg-foreign:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: pkg-none-native* @@ -57,7 +57,7 @@ This should NOT be done unless you know exactly what you are doing! 0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. Purg pkg-none-native [1]' aptget purge pkg-none-native -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: pkg-none-foreign:i386* @@ -67,8 +67,9 @@ This should NOT be done unless you know exactly what you are doing! 0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. Purg pkg-none-foreign:i386 [1]' aptget purge pkg-none-foreign:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... +Calculating upgrade... The following NEW packages will be installed: pkg-depends-new:i386 pkg-none-new The following packages will be upgraded: |