Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package rabbitmq-c for openSUSE:Factory 
checked in at 2022-04-27 21:42:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rabbitmq-c (Old)
 and      /work/SRC/openSUSE:Factory/.rabbitmq-c.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rabbitmq-c"

Wed Apr 27 21:42:05 2022 rev:7 rq:973171 version:0.11.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/rabbitmq-c/rabbitmq-c.changes    2021-09-06 
15:58:17.729291529 +0200
+++ /work/SRC/openSUSE:Factory/.rabbitmq-c.new.1538/rabbitmq-c.changes  
2022-04-27 21:42:14.861079408 +0200
@@ -1,0 +2,6 @@
+Wed Apr 27 09:09:53 UTC 2022 - pgaj...@suse.com
+
+- give up to run testsuite when the server will not start in time
+  [bsc#1198202]
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rabbitmq-c.spec ++++++
--- /var/tmp/diff_new_pack.lZ0w5J/_old  2022-04-27 21:42:15.405080072 +0200
+++ /var/tmp/diff_new_pack.lZ0w5J/_new  2022-04-27 21:42:15.409080077 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rabbitmq-c
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2012-2015 Remi Collet
 #
 # All modifications and additions to the file contributed by third parties
@@ -107,15 +107,24 @@
 %endif
 sbin_base=/usr/lib*/rabbitmq/lib/rabbitmq_server-*/sbin
 $sbin_base/rabbitmq-server&
-sleep 5
+sleep 10
 $sbin_base/rabbitmqctl await_startup
+if ! $sbin_base/rabbitmqctl ping; then
+  # bsc#1198202 - FTBFS: rabbitmq-c won't compile on SP4
+  # handle the situation when rabbitmq server will not start
+  # in time
+  echo '### Server have not managed to start until now, giving up'
+  epmd -kill || true
+  exit 0
+fi
 echo "### Done, running tests"
 %ctest || exit_code=1
 echo "### Stopping RabbitMQ server .."
 $sbin_base/rabbitmqctl stop
 # needs to wait: Killing not allowed - living nodes in database.
-sleep 5
-epmd -kill
+sleep 10
+# do not bother when kill won't succeed
+epmd -kill || true
 echo "### Done"
 exit $exit_code
 

Reply via email to