[DRE-commits] [ruby-redis-store] 01/02: Start redis server from test file

[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-store.

commit ee6499d30f4156405b012c855f2a9c8dfea2e046
Author: Balasankar C <balasankarc at autistici.org>
Date:   Mon Dec 1 21:25:33 2014 +0530

    Start redis server from test file
---
 debian/ruby-tests.rake       | 26 +++++++++++++++++++++++++-
 debian/rules                 |  8 --------
 debian/start-redis-server.sh |  7 -------
 debian/stop-redis-server.sh  |  5 -----
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 17650ac..6c7edca 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,29 @@
 require 'gem2deb/rake/testtask'
-Gem2Deb::Rake::TestTask.new do |t|
+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
+
+Rake::TestTask.new do |t|
     t.libs << 'test'
   t.test_files = FileList['test/*/*_test.rb']
 end
+
+task :stop_redis do
+    sh 'pkill redis-server'
+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
diff --git a/debian/start-redis-server.sh b/debian/start-redis-server.sh
deleted file mode 100755
index 796f1a7..0000000
--- a/debian/start-redis-server.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-redis-server --daemonize yes --port 6379&
-redis-server --daemonize yes --port 6380&
-redis-server --daemonize yes --port 6381&
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-redis-store.git