tests: improve the server test script

This change improves the server container test script by adding some
informational output and streamlining the error handling a bit

Additionallt, it fixes some bad indentation.

Update tests/test-samba-container.sh

Signed-off-by: Michael Adam <[email protected]>
Co-authored-by: Anoop C S <[email protected]>

Author: 2 people

tests/test-samba-container.sh

@@ -1,43 +1,71 @@
 #!/bin/bash
 
 
+
+echo "determining container command."
 if [ -z "${CONTAINER_CMD}" ]; then
-	CONTAINER_CMD=$(command -v docker || echo "")
+	CONTAINER_CMD=$(command -v docker || echo )
 fi
 if [ -z "${CONTAINER_CMD}" ]; then
-	CONTAINER_CMD=$(command -v podman || echo "")
+	CONTAINER_CMD=$(command -v podman || echo )
 fi
-
+if [ -z "${CONTAINER_CMD}" ]; then
+echo "Error determining container command."
+exit 1
+fi
+echo "container command: '${CONTAINER_CMD}'."
+echo "creating temporary directory."
 TMPDIR="$(mktemp -d)"
 rc=$?
 
 if [ $rc -ne 0 ]; then
-	echo "Error creating temporary directory"
-else
-	CONTAINER_ID="$(${CONTAINER_CMD} run --network=none --name samba \
-		--volume="${TMPDIR}":/share:Z --rm  -d "${LOCAL_TAG}")"
+	echo "Error creating temporary directory."
+	exit 1
+fi
+echo "temporary directory: '${TMPDIR}'"
+echo "starting Samba container."
+CONTAINER_ID="$(${CONTAINER_CMD} run --network=none --name samba \
+	--volume="${TMPDIR}":/share:Z --rm  -d "${LOCAL_TAG}")"
+rc=$?
+
+if [ $rc -ne 0 ]; then
+	echo "Error running samba container"
+	exit 1
+fi
+echo "Container started, ID: '${CONTAINER_ID}'"
+
+# give samba a second to come up
+sleep 1
+
+echo "Listing samba shares"
+	${CONTAINER_CMD} exec "${CONTAINER_ID}" smbclient -U% -L 127.0.0.1
 	rc=$?
 
-	if [ $rc -ne 0 ]; then
-		echo "Error running samba container"
-	else
-		echo "Container started, ID: '${CONTAINER_ID}'"
+if [ ${rc} -ne 0 ]; then
+	echo "Error listing samba shares"
+	exit 1
+fi
 
-		# give samba a second to come up
-		sleep 1
 
-		${CONTAINER_CMD} exec "${CONTAINER_ID}" smbclient -U% -L 127.0.0.1
-		rc=$?
+echo "stopping samba container."
 
-		if [ $rc -ne 0 ]; then
-			echo "Error listing samba shares"
-		fi
-	fi
+${CONTAINER_CMD} kill "${CONTAINER_ID}"
+rc=$?
 
-	${CONTAINER_CMD} kill "${CONTAINER_ID}"
+if [ $rc -ne 0 ]; then
+	echo "Error stopping samba container"
+	exit 1
 fi
 
+echo "samba container stopped."
+
+
+
+
+echo "removing temporary directory."
 rm -rf "${TMPDIR}"
+rc=$?
+
 
 if [ $rc -eq 0 ]; then
 	echo "Success"