summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-08-31 17:28:33 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-08-31 17:28:33 +0200
commitb2640c0afea4c3803ab46b130c960ea3029eb14d (patch)
tree1a2be5aa9bfba58cec6ece25ad5fdf3c40ee87fe /test/integration
parentd2b7b1300c7567b4c9d9b057d5077e66a9ba18b6 (diff)
tavis: run testcases a second time, but as root
Git-Dch: Ignore
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-get-install-deb2
-rwxr-xr-xtest/integration/test-ubuntu-bug-346386-apt-get-update-paywall24
2 files changed, 14 insertions, 12 deletions
diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
index 65951cede..89b7f7299 100755
--- a/test/integration/test-apt-get-install-deb
+++ b/test/integration/test-apt-get-install-deb
@@ -46,7 +46,7 @@ E: Unable to correct problems, you have held broken packages." aptget install ./
testdpkgnotinstalled 'foo'
testsuccess aptget install ./incoming/foo_1.0_i386.deb -o Debug::pkgCacheGen=1
-testdpkginstalled 'foo'
+testdpkginstalled 'foo:i386'
testsuccessequal "Reading package lists...
Building dependency tree...
diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
index 8f468b376..6ce6b5216 100755
--- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -17,9 +17,9 @@ changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights'
msgtest 'Acquire test file from the webserver to check' 'overwrite'
if downloadfile http://localhost:8080/holygrail ./knights-talking >/dev/null; then
- msgpass
+ msgpass
else
- msgfail
+ msgfail
fi
testfileequal knights-talking 'ni ni ni'
@@ -39,27 +39,29 @@ rm -rf rootdir/var/lib/apt/lists
testfailure aptget update
testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
-ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
+ensure_n_canary_strings_in_dir "$LISTS" 'ni ni ni' 0
testequal 'lock
-partial' ls $LISTS
+partial' ls "$LISTS"
# and again with pre-existing files with "valid data" which should remain
for f in Release Release.gpg main_binary-amd64_Packages main_source_Sources; do
- echo 'peng neee-wom' > $LISTS/localhost:8080_dists_stable_${f}
+ echo 'peng neee-wom' > "$LISTS/localhost:8080_dists_stable_${f}"
+ chmod 644 "$LISTS/localhost:8080_dists_stable_${f}"
done
testfailure aptget update
testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
-ensure_n_canary_strings_in_dir $LISTS 'peng neee-wom' 4
-ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
+ensure_n_canary_strings_in_dir "$LISTS" 'peng neee-wom' 4
+ensure_n_canary_strings_in_dir "$LISTS" 'ni ni ni' 0
# and now with a pre-existing InRelease file
-echo 'peng neee-wom' > $LISTS/localhost:8080_dists_stable_InRelease
-rm -f $LISTS/localhost:8080_dists_stable_Release $LISTS/localhost:8080_dists_stable_Release.gpg
+echo 'peng neee-wom' > "$LISTS/localhost:8080_dists_stable_InRelease"
+chmod 644 "$LISTS/localhost:8080_dists_stable_InRelease"
+rm -f "$LISTS/localhost:8080_dists_stable_Release" "$LISTS/localhost:8080_dists_stable_Release.gpg"
msgtest 'excpected failure of' 'apt-get update'
testfailure aptget update
testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
-ensure_n_canary_strings_in_dir $LISTS 'peng neee-wom' 3
-ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
+ensure_n_canary_strings_in_dir "$LISTS" 'peng neee-wom' 3
+ensure_n_canary_strings_in_dir "$LISTS" 'ni ni ni' 0