Pino Toscano
2014-Apr-18 09:45 UTC
[Libguestfs] [PATCH 1/2] ruby: tests: isolate boilerplate in common file
Isolate in a common file all the standard boilerplate in tests, i.e. the import of the test framework and the guestfs module (including the import path hack needed for the latter). Thanks to Vít Ondruch for the precious hints and suggestions. --- ruby/Makefile.am | 3 ++- ruby/t/tc_010_load.rb | 5 +---- ruby/t/tc_020_create.rb | 5 +---- ruby/t/tc_030_create_flags.rb | 7 ++----- ruby/t/tc_040_create_multiple.rb | 7 ++----- ruby/t/tc_050_handle_properties.rb | 7 ++----- ruby/t/tc_060_explicit_close.rb | 7 ++----- ruby/t/tc_070_optargs.rb | 7 ++----- ruby/t/tc_100_launch.rb | 5 +---- ruby/t/tc_410_close_event.rb | 5 +---- ruby/t/tc_420_log_messages.rb | 5 +---- ruby/t/tc_800_rhbz507346.rb | 7 ++----- ruby/t/tc_810_rhbz664558c6.rb | 7 ++----- ruby/t/tc_820_rhbz1046509.rb | 7 ++----- ruby/t/test_helper.rb | 22 ++++++++++++++++++++++ 15 files changed, 45 insertions(+), 61 deletions(-) create mode 100644 ruby/t/test_helper.rb diff --git a/ruby/Makefile.am b/ruby/Makefile.am index 8c96844..f605188 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -29,7 +29,8 @@ EXTRA_DIST = \ lib/guestfs.rb \ run-bindtests \ run-ruby-tests \ - t/tc_*.rb + t/tc_*.rb \ + t/test_helper.rb CLEANFILES = \ lib/*~ \ diff --git a/ruby/t/tc_010_load.rb b/ruby/t/tc_010_load.rb index 800d1ff..f1d296c 100644 --- a/ruby/t/tc_010_load.rb +++ b/ruby/t/tc_010_load.rb @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_load diff --git a/ruby/t/tc_020_create.rb b/ruby/t/tc_020_create.rb index d765acd..7476439 100644 --- a/ruby/t/tc_020_create.rb +++ b/ruby/t/tc_020_create.rb @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_create diff --git a/ruby/t/tc_030_create_flags.rb b/ruby/t/tc_030_create_flags.rb index 7ec2ce9..3286a1f 100644 --- a/ruby/t/tc_030_create_flags.rb +++ b/ruby/t/tc_030_create_flags.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2013 Red Hat Inc. +# Copyright (C) 2013-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_create_flags diff --git a/ruby/t/tc_040_create_multiple.rb b/ruby/t/tc_040_create_multiple.rb index 339b699..0d86786 100644 --- a/ruby/t/tc_040_create_multiple.rb +++ b/ruby/t/tc_040_create_multiple.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2013 Red Hat Inc. +# Copyright (C) 2013-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_create_multiple diff --git a/ruby/t/tc_050_handle_properties.rb b/ruby/t/tc_050_handle_properties.rb index cf4a7a7..55bb207 100644 --- a/ruby/t/tc_050_handle_properties.rb +++ b/ruby/t/tc_050_handle_properties.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2013 Red Hat Inc. +# Copyright (C) 2013-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_handle_properties diff --git a/ruby/t/tc_060_explicit_close.rb b/ruby/t/tc_060_explicit_close.rb index 74456e4..4752d47 100644 --- a/ruby/t/tc_060_explicit_close.rb +++ b/ruby/t/tc_060_explicit_close.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2013 Red Hat Inc. +# Copyright (C) 2013-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_explicit_close diff --git a/ruby/t/tc_070_optargs.rb b/ruby/t/tc_070_optargs.rb index e28f944..b8c23e6 100644 --- a/ruby/t/tc_070_optargs.rb +++ b/ruby/t/tc_070_optargs.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2010 Red Hat Inc. +# Copyright (C) 2010-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_optargs diff --git a/ruby/t/tc_100_launch.rb b/ruby/t/tc_100_launch.rb index f77a026..68fb119 100644 --- a/ruby/t/tc_100_launch.rb +++ b/ruby/t/tc_100_launch.rb @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_launch diff --git a/ruby/t/tc_410_close_event.rb b/ruby/t/tc_410_close_event.rb index f694ca8..d0c4465 100644 --- a/ruby/t/tc_410_close_event.rb +++ b/ruby/t/tc_410_close_event.rb @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_events diff --git a/ruby/t/tc_420_log_messages.rb b/ruby/t/tc_420_log_messages.rb index 6757d46..4397e6e 100644 --- a/ruby/t/tc_420_log_messages.rb +++ b/ruby/t/tc_420_log_messages.rb @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_events diff --git a/ruby/t/tc_800_rhbz507346.rb b/ruby/t/tc_800_rhbz507346.rb index 66e0e92..100b1fe 100644 --- a/ruby/t/tc_800_rhbz507346.rb +++ b/ruby/t/tc_800_rhbz507346.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2009 Red Hat Inc. +# Copyright (C) 2009-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,10 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_rhbz507346 diff --git a/ruby/t/tc_810_rhbz664558c6.rb b/ruby/t/tc_810_rhbz664558c6.rb index 5eb373e..105035b 100644 --- a/ruby/t/tc_810_rhbz664558c6.rb +++ b/ruby/t/tc_810_rhbz664558c6.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2011 Red Hat Inc. +# Copyright (C) 2011-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,10 +19,7 @@ # the interpreter to segfault. See: # https://bugzilla.redhat.com/show_bug.cgi?id=664558#c6 -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def test_rhbz664558c6 diff --git a/ruby/t/tc_820_rhbz1046509.rb b/ruby/t/tc_820_rhbz1046509.rb index 978decd..831aaf0 100644 --- a/ruby/t/tc_820_rhbz1046509.rb +++ b/ruby/t/tc_820_rhbz1046509.rb @@ -1,5 +1,5 @@ # libguestfs Ruby bindings -*- ruby -*- -# Copyright (C) 2013 Red Hat Inc. +# Copyright (C) 2013-2014 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,10 +18,7 @@ # Test that we don't break the old ::create module function while # fixing https://bugzilla.redhat.com/show_bug.cgi?id=1046509 -require 'test/unit' -$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) -$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) -require 'guestfs' +require File::join(File::dirname(__FILE__), 'test_helper') class TestLoad < Test::Unit::TestCase def _handleok(g) diff --git a/ruby/t/test_helper.rb b/ruby/t/test_helper.rb new file mode 100644 index 0000000..8ebfe2f --- /dev/null +++ b/ruby/t/test_helper.rb @@ -0,0 +1,22 @@ +# libguestfs Ruby bindings -*- ruby -*- +# Copyright (C) 2009-2014 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +require 'test/unit' + +$:.unshift(File::join(File::dirname(__FILE__), "..", "lib")) +$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "guestfs")) +require 'guestfs' -- 1.9.0
Pino Toscano
2014-Apr-18 09:45 UTC
[Libguestfs] [PATCH 2/2] ruby: tests: convert from Test::Unit to MiniTest (RHBZ#1085029)
Convert the tests to the MiniTest test framework, but keeping the usage
of the old Test::Unit as fallback in case MiniTest is not available.
In the latter case, use a bit of "glue" to make the old API look like
the new API, so we can just rely on the newer MiniTest API.
---
ruby/t/tc_010_load.rb | 2 +-
ruby/t/tc_020_create.rb | 4 ++--
ruby/t/tc_030_create_flags.rb | 4 ++--
ruby/t/tc_040_create_multiple.rb | 8 ++++----
ruby/t/tc_050_handle_properties.rb | 4 ++--
ruby/t/tc_060_explicit_close.rb | 4 ++--
ruby/t/tc_070_optargs.rb | 2 +-
ruby/t/tc_100_launch.rb | 2 +-
ruby/t/tc_410_close_event.rb | 2 +-
ruby/t/tc_420_log_messages.rb | 2 +-
ruby/t/tc_800_rhbz507346.rb | 4 ++--
ruby/t/tc_810_rhbz664558c6.rb | 2 +-
ruby/t/tc_820_rhbz1046509.rb | 2 +-
ruby/t/test_helper.rb | 13 ++++++++++++-
14 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/ruby/t/tc_010_load.rb b/ruby/t/tc_010_load.rb
index f1d296c..71fad63 100644
--- a/ruby/t/tc_010_load.rb
+++ b/ruby/t/tc_010_load.rb
@@ -17,7 +17,7 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_load
end
end
diff --git a/ruby/t/tc_020_create.rb b/ruby/t/tc_020_create.rb
index 7476439..e033ea5 100644
--- a/ruby/t/tc_020_create.rb
+++ b/ruby/t/tc_020_create.rb
@@ -17,9 +17,9 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_create
g = Guestfs::Guestfs.new()
- assert_not_nil (g)
+ refute_nil (g)
end
end
diff --git a/ruby/t/tc_030_create_flags.rb b/ruby/t/tc_030_create_flags.rb
index 3286a1f..9725a58 100644
--- a/ruby/t/tc_030_create_flags.rb
+++ b/ruby/t/tc_030_create_flags.rb
@@ -17,10 +17,10 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_create_flags
g = Guestfs::Guestfs.new(:environment => false, :close_on_exit =>
true)
- assert_not_nil (g)
+ refute_nil (g)
g.parse_environment()
end
end
diff --git a/ruby/t/tc_040_create_multiple.rb b/ruby/t/tc_040_create_multiple.rb
index 0d86786..887b8a4 100644
--- a/ruby/t/tc_040_create_multiple.rb
+++ b/ruby/t/tc_040_create_multiple.rb
@@ -17,13 +17,13 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_create_multiple
g1 = Guestfs::Guestfs.new()
g2 = Guestfs::Guestfs.new()
g3 = Guestfs::Guestfs.new()
- assert_not_nil (g1)
- assert_not_nil (g2)
- assert_not_nil (g3)
+ refute_nil (g1)
+ refute_nil (g2)
+ refute_nil (g3)
end
end
diff --git a/ruby/t/tc_050_handle_properties.rb
b/ruby/t/tc_050_handle_properties.rb
index 55bb207..85a74ea 100644
--- a/ruby/t/tc_050_handle_properties.rb
+++ b/ruby/t/tc_050_handle_properties.rb
@@ -17,10 +17,10 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_handle_properties
g = Guestfs::Guestfs.new()
- assert_not_nil (g)
+ refute_nil (g)
v = g.get_verbose()
g.set_verbose(v)
v = g.get_trace()
diff --git a/ruby/t/tc_060_explicit_close.rb b/ruby/t/tc_060_explicit_close.rb
index 4752d47..32b3cb9 100644
--- a/ruby/t/tc_060_explicit_close.rb
+++ b/ruby/t/tc_060_explicit_close.rb
@@ -17,10 +17,10 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_explicit_close
g = Guestfs::Guestfs.new()
- assert_not_nil (g)
+ refute_nil (g)
g.close()
end
end
diff --git a/ruby/t/tc_070_optargs.rb b/ruby/t/tc_070_optargs.rb
index b8c23e6..3374880 100644
--- a/ruby/t/tc_070_optargs.rb
+++ b/ruby/t/tc_070_optargs.rb
@@ -17,7 +17,7 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_optargs
g = Guestfs::Guestfs.new()
diff --git a/ruby/t/tc_100_launch.rb b/ruby/t/tc_100_launch.rb
index 68fb119..2a3277a 100644
--- a/ruby/t/tc_100_launch.rb
+++ b/ruby/t/tc_100_launch.rb
@@ -17,7 +17,7 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_launch
g = Guestfs::Guestfs.new()
diff --git a/ruby/t/tc_410_close_event.rb b/ruby/t/tc_410_close_event.rb
index d0c4465..0a124bd 100644
--- a/ruby/t/tc_410_close_event.rb
+++ b/ruby/t/tc_410_close_event.rb
@@ -17,7 +17,7 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_events
g = Guestfs::Guestfs.new()
diff --git a/ruby/t/tc_420_log_messages.rb b/ruby/t/tc_420_log_messages.rb
index 4397e6e..4a84f4a 100644
--- a/ruby/t/tc_420_log_messages.rb
+++ b/ruby/t/tc_420_log_messages.rb
@@ -17,7 +17,7 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_events
g = Guestfs::Guestfs.new()
diff --git a/ruby/t/tc_800_rhbz507346.rb b/ruby/t/tc_800_rhbz507346.rb
index 100b1fe..a94872d 100644
--- a/ruby/t/tc_800_rhbz507346.rb
+++ b/ruby/t/tc_800_rhbz507346.rb
@@ -17,13 +17,13 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_rhbz507346
g = Guestfs::Guestfs.new()
g.add_drive_scratch(10*1024*1024)
g.launch()
- exception = assert_raise TypeError do
+ exception = assert_raises TypeError do
g.command(1)
end
assert_match /wrong argument type Fixnum \(expected Array\)/,
exception.message
diff --git a/ruby/t/tc_810_rhbz664558c6.rb b/ruby/t/tc_810_rhbz664558c6.rb
index 105035b..f68c8df 100644
--- a/ruby/t/tc_810_rhbz664558c6.rb
+++ b/ruby/t/tc_810_rhbz664558c6.rb
@@ -21,7 +21,7 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def test_rhbz664558c6
g = Guestfs::Guestfs.new()
diff --git a/ruby/t/tc_820_rhbz1046509.rb b/ruby/t/tc_820_rhbz1046509.rb
index 831aaf0..5164b88 100644
--- a/ruby/t/tc_820_rhbz1046509.rb
+++ b/ruby/t/tc_820_rhbz1046509.rb
@@ -20,7 +20,7 @@
require File::join(File::dirname(__FILE__), 'test_helper')
-class TestLoad < Test::Unit::TestCase
+class TestLoad < MiniTest::Unit::TestCase
def _handleok(g)
g.add_drive("/dev/null")
g.close()
diff --git a/ruby/t/test_helper.rb b/ruby/t/test_helper.rb
index 8ebfe2f..e58af29 100644
--- a/ruby/t/test_helper.rb
+++ b/ruby/t/test_helper.rb
@@ -15,7 +15,18 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-require 'test/unit'
+begin
+ require 'minitest/autorun'
+rescue LoadError
+ require 'test/unit'
+ MiniTest = Test
+ module Test
+ Assertions = Unit::Assertions
+ module Assertions
+ alias refute_nil assert_not_nil
+ end
+ end
+end
$:.unshift(File::join(File::dirname(__FILE__), "..",
"lib"))
$:.unshift(File::join(File::dirname(__FILE__), "..", "ext",
"guestfs"))
--
1.9.0
Richard W.M. Jones
2014-Apr-22 11:48 UTC
Re: [Libguestfs] [PATCH 1/2] ruby: tests: isolate boilerplate in common file
Looks good, ACK to both. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW