[DRE-commits] [ruby-activeldap] 01/03: [fix] how tests are run, associated build-depends, and depends (affects tests too)

[Marc Dequènes]

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

duck pushed a commit to branch master
in repository ruby-activeldap.

commit fcf073954d87404cb9dde1096fa0cc0af7f97286
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Mon Dec 2 20:29:17 2013 +0100

    [fix] how tests are run, associated build-depends, and depends (affects tests too)
---
 debian/changelog                                   | 10 ++++++
 debian/control                                     |  4 +--
 .../buildsys_tests_no_rubygems_and_bundler.patch   | 16 +++++++++
 debian/patches/series                              |  1 +
 debian/ruby-test-files.yaml                        | 38 ----------------------
 debian/ruby-tests.rb                               |  1 +
 6 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef1338f..44f1d89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-activeldap (3.2.2-2) UNRELEASED; urgency=low
+
+  * Fixed how tests are run (Closes: #730954).
+  * Patched buildsys to run tests without Rubygems, Bundler, and 
+    Test::Unit::Notify.
+  * Added missing build dependencies for tests.
+  * Depends on ruby-activemodel instead of ruby-activerecord.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 02 Dec 2013 19:46:23 +0100
+
 ruby-activeldap (3.2.2-1) unstable; urgency=low
 
   [ Cédric Boutillier ]
diff --git a/debian/control b/debian/control
index 0127635..0ecb031 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, 
 	   Deepak Tripathi <apenguinlinux at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-test-unit, ruby-activesupport (>= 3.2), ruby-activemodel (>= 3.2)
 Build-Depends-Indep: graphviz
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-activeldap.git
@@ -15,7 +15,7 @@ XS-Ruby-Versions: all
 Package: ruby-activeldap
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-ldap (>= 0.8.2), ruby-activesupport (>= 3.2), ruby-activerecord (>= 3.2), ruby-locale, ruby-gettext, ruby-gettext-i18n-rails
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-ldap (>= 0.8.2), ruby-activesupport (>= 3.2), ruby-activemodel (>= 3.2), ruby-locale, ruby-gettext, ruby-gettext-i18n-rails
 Suggests: ruby-log4r (>= 1.0.4), ruby-fastgettext
 Description: ActiveLdap is a object-oriented API to LDAP
  'ActiveLdap' is a ruby extension library which provides a clean
diff --git a/debian/patches/buildsys_tests_no_rubygems_and_bundler.patch b/debian/patches/buildsys_tests_no_rubygems_and_bundler.patch
new file mode 100644
index 0000000..72ccfd8
--- /dev/null
+++ b/debian/patches/buildsys_tests_no_rubygems_and_bundler.patch
@@ -0,0 +1,16 @@
+Index: ruby-activeldap/test/run-test.rb
+===================================================================
+--- ruby-activeldap.orig/test/run-test.rb	2013-12-02 19:54:59.576411193 +0100
++++ ruby-activeldap/test/run-test.rb	2013-12-02 20:03:18.987301997 +0100
+@@ -10,11 +10,7 @@
+ $LOAD_PATH.unshift(File.join(top_dir, "lib"))
+ $LOAD_PATH.unshift(File.join(top_dir, "test"))
+ 
+-require "rubygems"
+-require "bundler/setup"
+-
+ require "test/unit"
+-require "test/unit/notify"
+ Test::Unit::Priority.enable
+ 
+ succeeded = true
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..667ac8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+buildsys_tests_no_rubygems_and_bundler.patch
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index a88a243..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
---- 
-- test/test_lpasswd.rb
-- test/test_groupadd.rb
-- test/test_groupdel.rb
-- test/test_base_per_instance.rb
-- test/test_groupls.rb
-- test/test_connection_per_dn.rb
-- test/test_connection.rb
-- test/test_usermod-lang-add.rb
-- test/test_associations.rb
-- test/test_schema.rb
-- test/test_dn.rb
-- test/test_attributes.rb
-- test/test_object_class.rb
-- test/test_acts_as_tree.rb
-- test/test_usermod-binary-add.rb
-- test/test_find.rb
-- test/test_bind.rb
-- test/test_useradd-binary.rb
-- test/test_callback.rb
-- test/test_useradd.rb
-- test/test_usermod.rb
-- test/test_syntax.rb
-- test/test_usermod-binary-add-time.rb
-- test/test_user.rb
-- test/test_user_password.rb
-- test/test_base.rb
-- test/test_adapter.rb
-- test/test_groupmod.rb
-- test/test_reflection.rb
-- test/test_load.rb
-- test/test_configuration.rb
-- test/test_userls.rb
-- test/test_userdel.rb
-- test/test_validation.rb
-- test/test_ldif.rb
-- test/test_connection_per_class.rb
-- test/test_usermod-binary-del.rb
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..624e479
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1 @@
+exec "test/run-test.rb"

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