Smoke tests improvements

smoke-tests/test-autoreceive.sh

@@ -11,6 +11,7 @@ RECEIVER_TAG=foobar
 ${NASEFA} auto-receive ${TEMPDIR} ${RECEIVER_TAG} some-tag some-other-tag &
 RECEIVE_PID=${!}
 log_debug "Started auto-receiver, PID: ${RECEIVE_PID}"
+trap "kill -9 ${RECEIVE_PID} || echo" EXIT
 
 BUNDLE_NAME="send-autoreceive-test-$((RANDOM))"
 F1=theplague.png

smoke-tests/test-web-send-receive-whitespace.sh

@@ -10,24 +10,26 @@ source ${SCRIPT_DIR}/util.sh
 BUNDLE_NAME="web-send-receive-test-whitespace-$((RANDOM))"
 F1=README.md
 F1_WITH_SPACES="READ ME.md"
+F1_URL_ENCODED="READ%20ME.md"
 
 # Create a file with spaces in name
 cp ${NASEFA_ROOT}/${F1} "${TEMPDIR}/${F1_WITH_SPACES}"
 
 
 PORT=8081
 
-${NASEFA} web -bindAddr ":${PORT}" &
+${NASEFA} web -allowBundlesListing -bindAddr ":${PORT}" &
 WEB_PID=${!}
 log_debug "Started web, PID: ${WEB_PID}"
+trap "kill -9 ${WEB_PID} || echo" EXIT
 
 ${NASEFA} create -bundleName ${BUNDLE_NAME}
 log_debug "Bundle created: ${BUNDLE_NAME}"
 
 curl -s -F "file1=@${TEMPDIR}/${F1_WITH_SPACES}" http://localhost:${PORT}/upload/${BUNDLE_NAME} >/dev/null || fail "Failed to upload files"
 log_debug "Uploaded 1 file with spaces"
 
-curl -s  "http://localhost:${PORT}/bundle/${BUNDLE_NAME}/${F1_WITH_SPACES}" > ${TEMPDIR}/${F1} || fail "Failed to download file"
+curl -s  "http://localhost:${PORT}/bundle/${BUNDLE_NAME}/${F1_URL_ENCODED}" > ${TEMPDIR}/${F1} || fail "Failed to download file"
 log_debug "Downloaded 1 file (saved without spaces)"
 
 kill ${WEB_PID}

smoke-tests/test-web-send-receive.sh

@@ -13,9 +13,10 @@ F2=README.md
 
 PORT=8081
 
-${NASEFA} web -bindAddr ":${PORT}" &
+${NASEFA} web -allowBundlesListing -bindAddr ":${PORT}" &
 WEB_PID=${!}
 log_debug "Started web, PID: ${WEB_PID}"
+trap "kill -9 ${WEB_PID} || echo" EXIT
 
 ${NASEFA} create -bundleName ${BUNDLE_NAME}
 log_debug "Bundle created: ${BUNDLE_NAME}"