Merge ~chris.macnaughton/ubuntu/+source/swift:master into ~ubuntu-server-dev/ubuntu/+source/swift:master

[Chris MacNaughton]

[Corey Bryant (corey.bryant)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 03dea9d..1a2b707 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+swift (2.25.0-0ubuntu3) UNRELEASED; urgency=medium
+
+  * d/t/swift-daemons: Update to validate systemd units.
+
+ -- Chris MacNaughton <[e-mail]>  Thu, 25 Jun 2020 11:30:03 +0000
+
 swift (2.25.0-0ubuntu2) groovy; urgency=medium
 
   [ Chris MacNaughton ]
diff --git a/debian/tests/swift-daemons b/debian/tests/swift-daemons
index f9a5257..46dd999 100755
--- a/debian/tests/swift-daemons
+++ b/debian/tests/swift-daemons
@@ -3,6 +3,7 @@
 # Testing swift-proxy
 #--------------------
 set -e
+failure=false
 
 # copy config files
 mkdir -p /etc/swift 2>&1 > /dev/null
@@ -24,13 +25,32 @@ swift-ring-builder container.builder rebalance 2>&1 > /dev/null
 swift-ring-builder object.builder rebalance 2>&1 > /dev/null
 
 DAEMONS=('swift-proxy' 'swift-object' 'swift-container' 'swift-account')
+
+for daemon in "${DAEMONS[@]}"; do
+    systemctl restart $daemon
+done
+
 for daemon in "${DAEMONS[@]}"; do
-    service $daemon restart 2>&1 > /dev/null
-    if pidof -x ${daemon}-server > /dev/null; then
-        echo "OK"
+    TIMEOUT=50
+    while [ "$TIMEOUT" -gt 0 ]; do
+        if pidof -x ${daemon}-server > /dev/null; then
+            echo "OK"
+            break
+        fi
+        TIMEOUT=$((TIMEOUT - 1))
+        sleep 0.1
+    done
+
+    if [ "$TIMEOUT" -le 0 ]; then
+        echo "ERROR: ${daemon}-server IS NOT RUNNING"
+        failure=true
     else
-        echo "ERROR: ${daemon} IS NOT RUNNING"
-        exit 1
+        echo "${daemon}-server IS RUNNING"
     fi
 done
+
+if [ "$failure" = true ]; then
+    exit 1
+fi
+
 exit 0