Adds redis-server-bootstrap autostart test and fixes the same for redis-server-wrapper.

Author: jdeathe

environment.mk

@@ -34,7 +34,7 @@ NO_CACHE ?= false
 DIST_PATH ?= ./dist
 
 # Number of seconds expected to complete container startup including bootstrap.
-STARTUP_TIME ?= 1
+STARTUP_TIME ?= 2
 
 # ------------------------------------------------------------------------------
 # Application container configuration

src/opt/scmi/environment.sh

@@ -28,7 +28,7 @@ NO_CACHE="${NO_CACHE:-false}"
 DIST_PATH="${DIST_PATH:-./dist}"
 
 # Number of seconds expected to complete container startup including bootstrap.
-STARTUP_TIME="${STARTUP_TIME:-1}"
+STARTUP_TIME="${STARTUP_TIME:-2}"
 
 # Docker --sysctl settings
 SYSCTL_NET_CORE_SOMAXCONN="${SYSCTL_NET_CORE_SOMAXCONN:-1024}"

src/opt/scmi/service-unit.sh

@@ -27,4 +27,4 @@ readonly SERVICE_UNIT_REGISTER_ENVIRONMENT_KEYS="
 # -----------------------------------------------------------------------------
 # Variables
 # -----------------------------------------------------------------------------
-SERVICE_UNIT_INSTALL_TIMEOUT=${SERVICE_UNIT_INSTALL_TIMEOUT:-4}
+SERVICE_UNIT_INSTALL_TIMEOUT=${SERVICE_UNIT_INSTALL_TIMEOUT:-5}

test/shpec/operation_shpec.sh

@@ -1,4 +1,4 @@
-readonly STARTUP_TIME=1
+readonly STARTUP_TIME=2
 readonly TEST_DIRECTORY="test"
 
 # These should ideally be a static value but hosts might be using this port so 
@@ -546,16 +546,16 @@ function test_custom_configuration ()
 		docker run \
 			--detach \
 			--name redis.pool-1.1.1 \
-			--env MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=false \
+			--env REDIS_AUTOSTART_REDIS_WRAPPER=false \
 			jdeathe/centos-ssh-redis:latest \
 		&> /dev/null
 
 		sleep ${STARTUP_TIME}
 
-		it "Can disable redis-wrapper."
+		it "Can disable redis-server-wrapper."
 			docker ps \
-				--format "name=redis.pool-1.1.1" \
-				--format "health=healthy" \
+				--filter "name=redis.pool-1.1.1" \
+				--filter "health=healthy" \
 			&> /dev/null \
 			&& docker top \
 				redis.pool-1.1.1 \
@@ -569,6 +569,34 @@ function test_custom_configuration ()
 		__terminate_container \
 			redis.pool-1.1.1 \
 		&> /dev/null
+
+		docker run \
+			--detach \
+			--name redis.pool-1.1.1 \
+			--env REDIS_AUTOSTART_REDIS_BOOTSTRAP=false \
+			jdeathe/centos-ssh-redis:latest \
+		&> /dev/null
+
+		sleep ${STARTUP_TIME}
+
+		it "Can disable redis-server-bootstrap."
+			docker ps \
+				--filter "name=redis.pool-1.1.1" \
+				--filter "health=healthy" \
+			&> /dev/null \
+			&& docker exec \
+				redis.pool-1.1.1 \
+				grep -q '^bind 0.0.0.0$' \
+				/etc/redis.conf
+
+			assert equal \
+				"${?}" \
+				"0"
+		end
+
+		__terminate_container \
+			redis.pool-1.1.1 \
+		&> /dev/null
 	end
 
 	trap - \