[DRE-commits] [ruby-sidekiq-cron] 01/03: Make ruby-tests.rake start and stop redis-server

[Lucas Moura]

This is an automated email from the git hooks/post-receive script.

lucasmoura-guest pushed a commit to branch master
in repository ruby-sidekiq-cron.

commit 587206d2ee4b52bfe75fcb8ede14276b690b40ec
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Thu Mar 3 15:22:21 2016 -0300

    Make ruby-tests.rake start and stop redis-server
---
 debian/changelog             |  9 +++++++++
 debian/ruby-tests.rake       | 12 +++++++++---
 debian/rules                 | 13 -------------
 debian/start-redis-server.sh | 14 ++++++++++++--
 debian/stop-redis-server.sh  |  5 -----
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 648da31..2b1d9f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-sidekiq-cron (0.4.2-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Remove script execution during dh_auto_install and dh_auto_clean
+  * Make ruby-tests.rake file to init redis-server and kill it once the
+    tests are executed.
+
+ -- Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>  Thu, 03 Mar 2016 15:17:51 -0300
+
 ruby-sidekiq-cron (0.4.2-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 63f3fd6..9f41bd4 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,6 +1,12 @@
 require 'gem2deb/rake/testtask'
 
-Gem2Deb::Rake::TestTask.new do |t|
-  t.libs = ['test']
-  t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
+task :default do
+  ruby = RbConfig::CONFIG['ruby_install_name']
+  sh "./debian/start-redis-server.sh #{ruby} -S rake -f #{__FILE__} test"
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/unit/**/*_test.rb']
+  t.verbose = true
 end
diff --git a/debian/rules b/debian/rules
index e63c4b3..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,3 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
-
-override_dh_auto_clean:
-	dh_auto_clean -O--buildsystem=ruby
-	# kill redis server for tests, don't fail if not started
-	debian/stop-redis-server.sh || true
-
-override_dh_auto_install:
-	# start redis server for tests
-	debian/start-redis-server.sh
-	# auto install
-	dh_auto_install -O--buildsystem=ruby
-	# kill redis server used for tests
-	debian/stop-redis-server.sh
diff --git a/debian/start-redis-server.sh b/debian/start-redis-server.sh
index 9f95a6c..6af128d 100755
--- a/debian/start-redis-server.sh
+++ b/debian/start-redis-server.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-set -e
+set -ex
 
-redis-server --daemonize yes
+redis-server &
+PID=$!
+
+# Stop redis-server
+cleanup(){
+    kill -9 $PID
+}
+
+trap cleanup INT EXIT TERM ALRM
+
+"$@"
diff --git a/debian/stop-redis-server.sh b/debian/stop-redis-server.sh
deleted file mode 100755
index 4174aee..0000000
--- a/debian/stop-redis-server.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-pkill redis-server

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sidekiq-cron.git