Merge branch 'stable'

deps/amqp_client/.travis.yml

@@ -1,30 +1,20 @@
 language: erlang
 otp_release:
   - "18.3"
+  - "19.0"
 
+# The checkout made by Travis is a "detached HEAD" and branches
+# information is missing. Our Erlang.mk's git_rmq fetch method relies on
+# it, so we need to restore it.
+#
+# We simply fetch master and, if it exists, stable branches. A branch is
+# created, pointing to the detached HEAD.
 before_script:
-  # The checkout made by Travis is a "detached HEAD". We switch back
-  # to a tag or a branch. This pleases our git_rmq fetch method in
-  # rabbitmq-components.mk and the proper tag/branch is selected in
-  # dependencies too.
-  #
-  # FIXME: There is still one problem: for builds triggered by a pull
-  # request, $TRAVIS_BRANCH contains the target branch name, not the
-  # source branch name. Therefore, we can't rely on automatic checkout
-  # of corresponding branches in dependencies. For instance, if the
-  # pull request comes from a branch "rabbitmq-server-123", based on
-  # "stable", then this command will checkout "stable" and we won't try
-  # to checkout "rabbitmq-server-123" in dependencies.
-  - git checkout -B "${TRAVIS_TAG:-${TRAVIS_BRANCH}}"
-
-  # We also make sure the "master" branch exists, because
-  # rabbitmq-components.mk expects it. If it's missing, we just create a
-  # fake branch pointing to the same commit as $TRAVIS_BRANCH.
-  - git rev-parse --verify -q master -- || git branch master
-
-  # Finally, Travis puts RabbitMQ variables in rabbitmq-env.conf. Just
-  # display the content: it can help to debug Travis-specific failures.
-  - '! test -f /etc/rabbitmq/rabbitmq-env.conf || cat /etc/rabbitmq/rabbitmq-env.conf'
+  - |
+    git checkout -B "${TRAVIS_TAG:-${TRAVIS_BRANCH}}"
+    git remote add upstream https://github.com/$TRAVIS_REPO_SLUG.git
+    git fetch upstream stable:stable || :
+    git fetch upstream master:master || :
 
 script:
   # Run the testsuite. This automatically includes the download of

deps/amqp_client/Makefile

@@ -9,12 +9,11 @@ PACKAGES_DIR ?= $(abspath PACKAGES)
 
 TEST_DEPS += rabbit
 
-DEP_PLUGINS = rabbit_common/mk/rabbitmq-dist.mk \
+DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
+	      rabbit_common/mk/rabbitmq-dist.mk \
 	      rabbit_common/mk/rabbitmq-run.mk \
 	      rabbit_common/mk/rabbitmq-tools.mk
 
-CT_OPTS += -ct_hooks cth_surefire
-
 # FIXME: Remove this line once Erlang.mk's ticket #502 gets fixed
 # and RabbitMQ updates it.
 

deps/amqp_client/test/system_SUITE.erl

@@ -331,7 +331,7 @@ basic_qos(Config) ->
     [NoQos, Qos] = [basic_qos_test(Config, Prefetch) || Prefetch <- [0,1]],
     ExpectedRatio = (1+1) / (1+50/5),
     FudgeFactor = 2, %% account for timing variations
-    ct:pal(
+    ct:pal(?LOW_IMPORTANCE,
       "QOS=0 -> ~p (noqos)~n"
       "QOS=1 -> ~p (qos)~n"
       "qos / noqos < ~p * ~p = ~p < ~p = ~p~n",