[DRE-commits] [SCM] ruby-mongo.git branch, master, updated. upstream/1.9.0-26-g8df2dcd

[Prach Pongpanich]

The following commit has been merged in the master branch:
commit a81dabc16e60e06196f53789ae7030ffdf924a3c
Author: Prach Pongpanich <prachpub at gmail.com>
Date:   Tue Jun 11 23:01:52 2013 +0700

    Refreshed debian/patches/enable_run_tests.patch

diff --git a/debian/patches/enable_run_tests.patch b/debian/patches/enable_run_tests.patch
index 2d53110..38fbe4d 100644
--- a/debian/patches/enable_run_tests.patch
+++ b/debian/patches/enable_run_tests.patch
@@ -1,10 +1,12 @@
 Description: for enable run tests at build time
 Author: Prach Pongpanich <prachpub at gmail.com>
 
---- ruby-mongo-1.8.5.orig/test/test_helper.rb
-+++ ruby-mongo-1.8.5/test/test_helper.rb
-@@ -1,114 +1,8 @@
--require 'rubygems'
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -19,116 +19,10 @@ rescue LoadError
+   # failed to load, skipping pry
+ end
+ 
 -# SimpleCov must load before our code - A coverage report summary line will print after each test suite
 -if RUBY_VERSION >= '1.9.0' && RUBY_ENGINE == 'ruby'
 -  if ENV.key?('COVERAGE')
@@ -21,12 +23,10 @@ Author: Prach Pongpanich <prachpub at gmail.com>
 -gem 'test-unit' # Do NOT remove this line - gem version is needed for Test::Unit::TestCase.shutdown
  require 'test/unit'
  require 'tools/mongo_config'
-+require 'shoulda'
-+require 'mocha'
- 
+-
 -class Test::Unit::TestCase
 -
--  TEST_DATA = File.join(File.dirname(__FILE__), 'data')
+-  TEST_DATA = File.join(File.dirname(__FILE__), 'fixtures/data')
 -
 -  def ensure_cluster(kind=nil, opts={})
 -    @@cluster ||= nil
@@ -117,17 +117,18 @@ Author: Prach Pongpanich <prachpub at gmail.com>
 -unless defined? TEST_HOST
 -  TEST_HOST = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
 -end
++require 'shoulda'
++require 'mocha'
  
  class Test::Unit::TestCase
    include Mongo
---- ruby-mongo-1.8.5.orig/test/tools/mongo_config.rb
-+++ ruby-mongo-1.8.5/test/tools/mongo_config.rb
-@@ -2,7 +2,7 @@
+--- a/test/tools/mongo_config.rb
++++ b/test/tools/mongo_config.rb
+@@ -17,7 +17,6 @@
  require 'socket'
  require 'fileutils'
  require 'mongo'
 -require 'sfl'
-+#require 'sfl'
  
  $debug_level = 2
  STDOUT.sync = true

-- 
ruby-mongo.git