[DRE-commits] [ruby-riot] 02/04: drop 01_fix_test_suite_for_ruby18.patch, add no_bundler.patch

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-riot.

commit 34ce16cc9e6ee5ebd42786dd0b7cccb3c42363c7
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jun 20 23:31:05 2014 +0200

    drop 01_fix_test_suite_for_ruby18.patch, add no_bundler.patch
---
 debian/patches/01_fix_test_suite_for_ruby18.patch | 24 -----------------------
 debian/patches/no_bundler.patch                   | 16 +++++++++++++++
 debian/patches/series                             |  2 +-
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/debian/patches/01_fix_test_suite_for_ruby18.patch b/debian/patches/01_fix_test_suite_for_ruby18.patch
deleted file mode 100644
index ce65038..0000000
--- a/debian/patches/01_fix_test_suite_for_ruby18.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix test suite for Ruby 1.8.7
-Origin: https://github.com/thumblemonks/riot/commit/a782fb4474bfc240c651ed9fd1ba58a4b8699801
-Author: Justin Knowlden <gus at gusg.us>
-Applied-Upstream: yes
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-03-07
-
---- a/test/core/reports/dot_matrix_reporter_test.rb
-+++ b/test/core/reports/dot_matrix_reporter_test.rb
-@@ -44,7 +44,13 @@
-     asserts_topic('puts the full context + assertion name').matches('whatever asserts bang')
-     asserts_topic('puts the exception message').matches('BOOM')
-     # <file path>:<one or more number><two newlines><anything till end of line><newline> is the last thing in the stack trace
--    asserts_topic('puts the filtered exception backtrace').matches(/#{__FILE__}:\d+:[^\n]*\n\n.*$\n\z/)
-+    asserts_topic('puts the filtered exception backtrace').matches do
-+      if RUBY_VERSION =~ /^1.8.\d+/
-+        /#{__FILE__}:\d+\n\n.*$\n\z/
-+      else
-+        /#{__FILE__}:\d+:[^\n]*\n\n.*$\n\z/
-+      end
-+    end
-   end
- end
- 
diff --git a/debian/patches/no_bundler.patch b/debian/patches/no_bundler.patch
new file mode 100644
index 0000000..1b3c188
--- /dev/null
+++ b/debian/patches/no_bundler.patch
@@ -0,0 +1,16 @@
+Description: do not use bundler in tests
+ no loadpath overload and no rubygems
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2014-06-20
+
+--- a/test/teststrap.rb
++++ b/test/teststrap.rb
+@@ -1,7 +1,3 @@
+-$:.unshift(File.dirname(__FILE__) + "/../lib/")
+-require 'rubygems'
+-require 'bundler/setup'
+-
+ require 'riot'
+ Riot.verbose
+ Riot.pretty_dots if ENV["TM_MODE"]
diff --git a/debian/patches/series b/debian/patches/series
index 49afc7f..e7364da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_fix_test_suite_for_ruby18.patch
+no_bundler.patch

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