[DRE-commits] [gem2deb] 04/05: Revert "check if the test_runner isn't trivial when trying to create the test suite"

Antonio Terceiro terceiro at moszumanska.debian.org
Sun May 17 03:05:32 UTC 2015


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

terceiro pushed a commit to branch master
in repository gem2deb.

commit 5f6e99c2bd40c292dd31ebd25cd9a668f8385e0f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat May 16 23:49:56 2015 -0300

    Revert "check if the test_runner isn't trivial when trying to create the test suite"
    
    This reverts commit b59753c2d1a5f4ec93a1a9ecfe615719228a1289.
---
 lib/gem2deb/dh_make_ruby.rb |  2 +-
 lib/gem2deb/test_runner.rb  | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 3315364..b7afc4b 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -372,7 +372,7 @@ module Gem2Deb
     end
 
     def test_suite
-      if !Gem2Deb::TestRunner.detect_real_runner
+      if !Gem2Deb::TestRunner.detect
         test_suite_rspec or test_suite_yaml or test_suite_rb
       end
     end
diff --git a/lib/gem2deb/test_runner.rb b/lib/gem2deb/test_runner.rb
index 5ab51c4..9867983 100644
--- a/lib/gem2deb/test_runner.rb
+++ b/lib/gem2deb/test_runner.rb
@@ -57,11 +57,6 @@ module Gem2Deb
       nil
     end
 
-    # override in subclasses if needed
-    def real_runner?
-      true
-    end
-
     def activate?
       required_file && File.exist?(required_file)
     end
@@ -114,11 +109,6 @@ module Gem2Deb
     def self.detect!
       detect || bail("E: this tool must be run from inside a Debian source package.")
     end
-    def self.detect_real_runner
-      subclasses.map(&:new).find do |runner|
-        runner.real_runner? && runner.activate?
-      end
-    end
     def self.bail(msg)
       puts msg
       exit 1
@@ -177,9 +167,6 @@ module Gem2Deb
       def run_tests
         puts "Running tests for #{rubyver}: found no way to run a test suite!"
       end
-      def real_runner?
-        false
-      end
     end
 
   end

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



More information about the Pkg-ruby-extras-commits mailing list