summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-06-18 11:21:35 +0200
committerMichael Vogt <mvo@debian.org>2014-06-18 11:24:16 +0200
commit8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b (patch)
tree000fce642c5c12f3cc8b5472bcd03994c78b5050 /test/integration
parent17091f2f33de16c2dae501e7868f7aec4fc3452f (diff)
parent82ced5c894cd013721f432ae8da66114155e04c7 (diff)
Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental
Conflicts: apt-private/private-install.cc
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-external-dependency-solver-protocol6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol
index 09230d383..07d2441b6 100755
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -51,6 +51,12 @@ rm -f /tmp/dump.edsp
testfailure aptget install --solver dump awesomecoolstuff:i386 -s
testsuccess test -s /tmp/dump.edsp
+testsuccess aptget dist-upgrade -s
+testsuccess aptget dist-upgrade -s --solver apt
+
+testsuccess aptget upgrade -s
+testsuccess aptget upgrade -s --solver apt
+
configarchitecture 'armel'
msgtest 'Test direct calling is okay for' 'apt-internal-solver'
cat /tmp/dump.edsp | aptinternalsolver > solver.result 2>&1 || true