[DRE-commits] [SCM] ruby-zoom.git branch, master, updated. upstream/0.4.1-9-gfceb3df

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 09e9bca4650de7d7b4958dfb3927af8e441ab208
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 29 22:10:50 2012 +0200

    Enable running of tests using ruby-tests.rare, added build-depends and patched a test

diff --git a/debian/changelog b/debian/changelog
index 389e897..22921d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,12 @@ ruby-zoom (0.4.1-3) UNRELEASED; urgency=low
     - Changed the build-depends for using gem2deb instead of ruby-pkg-tools.
     - Switched the maintainer with the uploaders field as per new
       convention the team is the default maintainer.
-    - Added libihelp-ruby and libihelp-ruby1.8 as transitional packages.
-    - Added a recommend on ruby-ferret (needed for full text search).
+    - Added libzoom-ruby and libzoom-ruby1.8 as transitional packages.
+    - Added build-depends on rake and ruby-test-unit for running the test
+      suite.
   * debian/copyright: reworked to fit the Debian copyright format version 1.0.
+  * debian/patches: added fix_assert_in_test.patch.
+  * debian/ruby-tests.rake: derived test suite from Rakefile.
   * debian/ruby-zoom.docs: renamed from libzoom-ruby1.8.docs.
   * debian/ruby-zoom.examples: renamed from libzoom-ruby1.8.examples.
 
diff --git a/debian/control b/debian/control
index bef5655..705bf24 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Paul van Tilburg <paulvt at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Deepak Tripathi <apenguinlinux at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), libyaz4-dev
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), libyaz4-dev, rake, ruby-test-unit
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-zoom.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-zoom.git;a=summary
diff --git a/debian/patches/fix_assert_in_test.patch b/debian/patches/fix_assert_in_test.patch
new file mode 100644
index 0000000..008eded
--- /dev/null
+++ b/debian/patches/fix_assert_in_test.patch
@@ -0,0 +1,11 @@
+--- a/test/package_test.rb
++++ b/test/package_test.rb
+@@ -31,7 +31,7 @@
+     #option correlationInfo.note
+       p = @connection.package
+       assert(p.respond_to?('correlation_info_note'))
+-      assert(true, p.respond_to?('correlation_info_note='))
++      assert(p.respond_to?('correlation_info_note='))
+       assert_equal(true, p.respond_to?('set_correlation_info_note'))
+ 
+       p.correlation_info_note = 'correlation_info_note value'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2ef21ea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_assert_in_test.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..94d8870
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,9 @@
+task :default => :test
+require 'rake/testtask'
+require 'rbconfig'
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/*_test.rb']
+  t.ruby_opts << '-I src' << '-rzoom' << '-rtest/unit'
+  t.verbose = true
+end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index eac5ce6..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# FIXME
-# there's a spec/ or a test/ directory in the upstream source, but
-# no test suite was defined in the Gem specification. It would be
-# a good idea to define it here so the package gets tested at build time.
-# Examples:
-# $: << 'lib' << '.'
-# Dir['{spec,test}/**/*.rb'].each { |f| require f }
-#
-# require 'test/ts_foo.rb'
-#
-# require 'rbconfig'
-# ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-# exec("#{ruby} -I. test/runtests.rb")

-- 
ruby-zoom.git