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