[omd-commits] OMD Git: omd: mod-gearman: update to 1.0.8

git version control git at mathias-kettner.de
Sat Jul 23 00:09:04 CEST 2011


Module:   omd
Branch:   master
Commit:   e0c051ec1936e883f19f811e9457a1807894c956
URL:      http://omdistro.org/projects/omd/repository/revisions/e0c051ec1936e883f19f811e9457a1807894c956

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Fri Jul 15 21:09:22 2011 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Fri Jul 22 23:23:46 2011 +0200

mod-gearman: update to 1.0.8

---

 packages/mod-gearman/Makefile                 |    4 ++--
 packages/mod-gearman/mod_gearman-1.0.7.tar.gz |  Bin 268949 -> 0 bytes
 packages/mod-gearman/mod_gearman-1.0.8.tar.gz |  Bin 0 -> 271996 bytes
 t/31-mod-gearman.t                            |   12 ++++++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index 6e3d1fe..3a111c4 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -1,8 +1,8 @@
 include ../../Makefile.omd
 
 NAME     = mod_gearman
-VERSION  = 1.0.7
-GEARMAND = 0.23
+VERSION  = 1.0.8
+GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }')
 DIR      = mod_gearman-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/mod-gearman/mod_gearman-1.0.7.tar.gz b/packages/mod-gearman/mod_gearman-1.0.7.tar.gz
deleted file mode 100644
index 837e7bf..0000000
Binary files a/packages/mod-gearman/mod_gearman-1.0.7.tar.gz and /dev/null differ
diff --git a/packages/mod-gearman/mod_gearman-1.0.8.tar.gz b/packages/mod-gearman/mod_gearman-1.0.8.tar.gz
new file mode 100644
index 0000000..9ee5adc
Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.0.8.tar.gz differ
diff --git a/t/31-mod-gearman.t b/t/31-mod-gearman.t
index cfc6dae..1934f34 100644
--- a/t/31-mod-gearman.t
+++ b/t/31-mod-gearman.t
@@ -13,7 +13,14 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
-plan( tests => 66 );
+plan( tests => 72 );
+
+##################################################
+# get version strings
+chomp(my $modgearman_version = qx(grep "^VERSION " packages/mod-gearman/Makefile | awk '{ print \$3 }'));
+chomp(my $libgearman_version = qx(grep "^VERSION " packages/gearmand/Makefile | awk '{ print \$3 }'));
+isnt($modgearman_version, '', "got modgearman_version") or BAIL_OUT("need mod-gearman version");
+isnt($libgearman_version, '', "got libgearman_version") or BAIL_OUT("need lib-gearman version");;
 
 ##################################################
 # create our test site
@@ -22,7 +29,7 @@ my $site    = TestUtils::create_test_site() or TestUtils::bail_out_clean("no fur
 my $host    = "omd-".$site;
 my $service = "Dummy+Service";
 
-
+##################################################
 # decrease status update interval
 TestUtils::test_command({ cmd => "/usr/bin/env sed -i -e 's/^status_update_interval=30/status_update_interval=3/g' /opt/omd/sites/$site/etc/nagios/nagios.d/tuning.cfg" });
 
@@ -43,6 +50,7 @@ for my $test (@{$preps}) {
 # execute some checks
 my $tests = [
   { cmd => "/bin/grep 'Event broker module.*mod_gearman.o.*initialized successfully' /omd/sites/$site/var/log/nagios.log", like => '/successfully/' },
+  { cmd => "/bin/grep 'mod_gearman: initialized version ".$modgearman_version." \(libgearman ".$libgearman_version."\)' /omd/sites/$site/var/log/nagios.log", like => '/initialized/' },
   { cmd => "/bin/su - $site -c 'bin/send_gearman --server=localhost:4730 --keyfile=etc/mod-gearman/secret.key --host=$host --message=test'" },
   { cmd => "/bin/su - $site -c 'bin/send_gearman --server=localhost:4730 --keyfile=etc/mod-gearman/secret.key --host=$host --service=$service --message=test'" },
   { cmd => "/bin/grep -i 'mod_gearman: ERROR' /omd/sites/$site/var/log/nagios.log", 'exit' => 1, like => '/^\s*$/' },



More information about the omd-commits mailing list