Merge branch 'stable'

3 files changed, 41 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 5ca29092d3..fcf7ff99e2 100644
--- a/Makefile
+++ b/Makefile
@@ -158,6 +158,24 @@ ERLANG_MK_COMMIT = rabbitmq-tmp
 include rabbitmq-components.mk
 include erlang.mk
 
+ifeq ($(strip $(BATS)),)
+BATS := $(ERLANG_MK_TMP)/bats/bin/bats
+endif
+
+BATS_GIT ?= https://github.com/sstephenson/bats
+BATS_COMMIT ?= v0.4.0
+
+$(BATS):
+	$(verbose) mkdir -p $(ERLANG_MK_TMP)
+	$(gen_verbose) git clone --depth 1 --branch=$(BATS_COMMIT) $(BATS_GIT) $(ERLANG_MK_TMP)/bats
+
+.PHONY: bats
+
+bats: $(BATS)
+	$(verbose) $(BATS) $(TEST_DIR)
+
+tests:: bats
+
 SLOW_CT_SUITES := backing_queue \
 		  cluster_rename \
 		  clustering_management \
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index e422557cac..2efe67bd34 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -77,6 +77,10 @@ ESCRIPT_DIR="${RABBITMQ_HOME}/escript"
 ## Set defaults
 . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults
 
+## Get configuration variables from the configure environment file
+[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE}
+[ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true
+
 DEFAULT_SCHEDULER_BIND_TYPE="db"
 [ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}
 
@@ -91,11 +95,6 @@ SERVER_ERL_ARGS="+P 1048576 +t 5000000 +stbt $RABBITMQ_SCHEDULER_BIND_TYPE +zdbb
 # it and warn the user.
 saved_RABBITMQ_PID_FILE=$RABBITMQ_PID_FILE
 
-## Get configuration variables from the configure environment file
-[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE}
-
-[ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true
-
 if [ "$saved_RABBITMQ_PID_FILE" -a \
      "$saved_RABBITMQ_PID_FILE" != "$RABBITMQ_PID_FILE" ]; then
     echo "WARNING: RABBITMQ_PID_FILE was already set by the init script to:" 1>&2
diff --git a/test/rabbitmq-env.bats b/test/rabbitmq-env.bats
new file mode 100644
index 0000000000..cbe4a27765
--- /dev/null
+++ b/test/rabbitmq-env.bats
@@ -0,0 +1,19 @@
+@test "can set RABBITMQ_SCHEDULER_BIND_TYPE from rabbitmq-env.conf" {
+    declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts"
+    export RABBITMQ_SCRIPTS_DIR="$scripts_dir"
+    export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf"
+    echo 'RABBITMQ_SCHEDULER_BIND_TYPE=u' > "$RABBITMQ_CONF_ENV_FILE"
+    source "$scripts_dir/rabbitmq-env"
+    echo "expect RABBITMQ_SERVER_ERL_ARGS to contain '+stbt u' but got '$SERVER_ERL_ARGS'" 
+    [[ $RABBITMQ_SERVER_ERL_ARGS == *+stbt\ u* ]]
+}
+
+@test "can set RABBITMQ_DISTRIBUTION_BUFFER_SIZE from rabbitmq-env.conf" {
+    declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts"
+    export RABBITMQ_SCRIPTS_DIR="$scripts_dir"
+    export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf"
+    echo 'RABBITMQ_DISTRIBUTION_BUFFER_SIZE=123456' > "$RABBITMQ_CONF_ENV_FILE"
+    source "$scripts_dir/rabbitmq-env"
+    echo "expect RABBITMQ_SERVER_ERL_ARGS to contain '+zdbbl 123456' but got '$SERVER_ERL_ARGS'" 
+    [[ $RABBITMQ_SERVER_ERL_ARGS == *+zdbbl\ 123456* ]]
+}