From 2dae6dd8d76e0ca87da770dd2194a8936eaf9285 Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg@smart.ms>
Date: Mar 25 2016 15:24:38 +0000
Subject: fix tests execution, properly stop mocked server


---

diff --git a/rabbitmq-java-client.spec b/rabbitmq-java-client.spec
index c0c1f3a..06f195e 100644
--- a/rabbitmq-java-client.spec
+++ b/rabbitmq-java-client.spec
@@ -8,7 +8,7 @@
 
 Name:          rabbitmq-java-client
 Version:       3.6.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Java Advanced Message Queue Protocol client library
 License:       ASL 2.0 and GPLv2+ and MPLv1.1
 URL:           http://www.rabbitmq.com/java-client.html
@@ -88,33 +88,34 @@ find . -name \*.tex -print -exec 'texi2html {} ; pdflatex {}' \; -delete
 find . -not -name channels.\* -delete
 
 
+%install
+%mvn_artifact build/bundle/amqp-client-%{version}.pom build/bundle/amqp-client-%{version}.jar
+%mvn_install -J build/doc/api
+
+
 %check
 ant test-jar
 
-# client tests need a mock server
+#ant test-suite
+#ant -Dtest=testDoubleDeletionExchange test-single
+ant test-server
+
+# client tests need a mock server, ugly hackery :)
 export RABBITMQ_LOG_BASE=.
 export RABBITMQ_MNESIA_BASE=.
 export RABBITMQ_NODENAME=testrabbit
-su rabbitmq -c 'rabbitmq-server -detach' &disown
+export RABBITMQ_ENV=%{_prefix}/lib/rabbitmq/bin/rabbitmq-env
+export RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV")
+%{_prefix}/lib/rabbitmq/bin/rabbitmq-server &disown
+trap "kill $! || true" EXIT
+sleep 4
+pgrep -cf rabbitmq_server && ant test-client
 
-#ant test-suite
-#ant -Dtest=testDoubleDeletionExchange test-single
-ant test-server
-ant test-client
 # FIXME functional tests failure ahead!
 #ant test-functional
 #ant test-functional-and-server-with-ha
 
-
-%install
-%mvn_artifact build/bundle/amqp-client-%{version}.pom build/bundle/amqp-client-%{version}.jar
-%mvn_install -J build/doc/api
-
-
-%clean
-#ant clean
-# FIXME assume there's only our test server
-su rabbitmq -c 'pgrep -u rabbitmq -f $RABBITMQ_NODENAME |xargs kill' || :
+pkill -f rabbitmq_server ||:
 
 
 %files -f .mfiles
@@ -129,6 +130,9 @@ su rabbitmq -c 'pgrep -u rabbitmq -f $RABBITMQ_NODENAME |xargs kill' || :
 
 
 %changelog
+* Fri Mar 25 2016 Raphael Groner <projects.rg@smart.ms> - 3.6.1-2
+- fix tests execution, properly stop mocked server
+
 * Tue Mar 01 2016 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 3.6.1-1
 - Update to 3.6.1 (#1313412)