[DRE-commits] [ruby-bdb] 04/09: Add 'dont-conflict-helpers-with-test-funcs' patch

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-bdb.

commit d76cc182dc5fad1187172fc105aad0628d32107e
Author: David Suárez <david.sephirot at gmail.com>
Date:   Fri May 2 22:19:49 2014 +0200

    Add 'dont-conflict-helpers-with-test-funcs' patch
---
 .../dont-conflict-helpers-with-test-funcs.patch    | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/dont-conflict-helpers-with-test-funcs.patch b/debian/patches/dont-conflict-helpers-with-test-funcs.patch
new file mode 100644
index 0000000..3bbb7b8
--- /dev/null
+++ b/debian/patches/dont-conflict-helpers-with-test-funcs.patch
@@ -0,0 +1,41 @@
+Description: Rename tests helpers functions
+ Rename the helpers that were executed as tests
+
+Author: David Suárez <david.sephirot at gmail.com>
+Last-Update: 2014-05-02
+
+--- ruby-bdb-0.6.6.orig/tests/lock.rb
++++ ruby-bdb-0.6.6/tests/lock.rb
+@@ -130,7 +130,7 @@ class TestLock < Inh::TestCase
+       end
+    end
+ 
+-   def test_forward(meth1, meth2)
++   def helper_test_forward(meth1, meth2)
+       assert_kind_of(BDB::Txn, txn1 = $env.begin("flags" => BDB::TXN_NOWAIT))
+       assert_kind_of(BDB::Queue, db1 = txn1.assoc($db))
+       ind1, = db1.push("record1")
+@@ -178,12 +178,12 @@ class TestLock < Inh::TestCase
+       end
+       ["commit", "abort"].each do |t1|
+ 	 ["commit", "abort"].each do |t2|
+-	    test_forward(t1, t2)
++	    helper_test_forward(t1, t2)
+ 	 end
+       end
+    end
+ 
+-   def test_reverse(meth1, meth2)
++   def helper_test_reverse(meth1, meth2)
+       assert_kind_of(BDB::Txn, txn1 = $env.begin("flags" => BDB::TXN_NOWAIT))
+       assert_kind_of(BDB::Queue, db1 = txn1.assoc($db))
+       ind1, = db1.push("record1")
+@@ -231,7 +231,7 @@ class TestLock < Inh::TestCase
+       end
+       ["commit", "abort"].each do |t1|
+ 	 ["commit", "abort"].each do |t2|
+-	    test_reverse(t1, t2)
++	    helper_test_reverse(t1, t2)
+ 	 end
+       end
+    end
diff --git a/debian/patches/series b/debian/patches/series
index 72f2d1f..9c1fcc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ dont-rely-on-ruby-objects-to-accommodate-c-data.patch
 use-same-encoding-for-dup-test.patch
 update-bdb-versions.patch
 fix-integer-overflow-on-bdb_h_hash-callback.patch
+dont-conflict-helpers-with-test-funcs.patch

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