[DRE-commits] [ruby-redis-rack] 03/05: Move redis-server starting jobs to rake

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository ruby-redis-rack.

commit 73222896ad5792a8d82de46223f0c3642783c5dc
Author: Balasankar C <balasankarc at autistici.org>
Date:   Tue Dec 2 20:17:41 2014 +0530

    Move redis-server starting jobs to rake
---
 debian/ruby-tests.rake | 26 +++++++++++++++++++++++++-
 debian/rules           |  8 --------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index e9d3521..cfabac6 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,6 +1,30 @@
+require 'gem2deb/rake/testtask'
+task :default do
+  Rake::Task[:start_redis].invoke
+  failed = false
+  begin
+    Rake::Task[:test].invoke
+  rescue
+    failed = true
+  end
+  Rake::Task[:stop_redis].invoke
+  if failed
+    fail 'Tests failed'
+  end
+end
+
+task :start_redis do
+    sh 'redis-server --daemonize yes --port 6379&'
+    sh 'redis-server --daemonize yes --port 6380&'
+    sh 'redis-server --daemonize yes --port 6381&'
+end
 
+task :stop_redis do
+    sh 'pkill redis-server'
+end
 require 'gem2deb/rake/testtask'
-Gem2Deb::Rake::TestTask.new do |t|
+
+Rake::TestTask.new do |t|
     t.libs << 'test'
     t.test_files = FileList['test/*/*/*_test.rb']
 end
diff --git a/debian/rules b/debian/rules
index c4e9118..cd2f913 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,4 @@
 
 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
-	dh_auto_install -O--buildsystem=ruby
-	# kill redis server used for tests
-	debian/stop-redis-server.sh

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