Attachment 888822 Details for Bug 1090407 – hivex-with-rubygem-minitestV5.patch

hivex-with-rubygem-minitestV5.patch

hivex-with-rubygem-minitestV5.patch (text/x-c), 6.26 KB, created by Michel Normand on 2014-04-23 09:18:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Normand

Created: 2014-04-23 09:18:29 UTC

Size: 6.26 KB

patch

obsolete

>Subject: hivex with rubygem minitestV5
>From: Michel Normand <normand@linux.vnet.ibm.com>
>
>with upgrade of rubygem minitest to 5.3.1
>all the ruby/tests/tc* files need to be changed.
>This patch is based on similar change made for libguestfs
>
>Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
>---
> ruby/tests/tc_010_load.rb      |    6 +++---
> ruby/tests/tc_021_close.rb     |    6 +++---
> ruby/tests/tc_120_rlenvalue.rb |   10 +++++-----
> ruby/tests/tc_130_special.rb   |    8 ++++----
> ruby/tests/tc_200_write.rb     |    6 +++---
> ruby/tests/tc_210_setvalue.rb  |    6 +++---
> ruby/tests/test_helper.rb      |   29 +++++++++++++++++++++++++++++
> 7 files changed, 50 insertions(+), 21 deletions(-)
>
>Index: hivex-1.3.9/ruby/tests/tc_010_load.rb
>===================================================================
>--- hivex-1.3.9.orig/ruby/tests/tc_010_load.rb
>+++ hivex-1.3.9/ruby/tests/tc_010_load.rb
>@@ -15,12 +15,12 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> 
>-require 'test/unit'
>+require File::join(File::dirname(__FILE__), 'test_helper')
> require 'hivex'
> 
>-class TestLoad < Test::Unit::TestCase
>+class TestLoad < MiniTest::Unit::TestCase
>   def test_load
>     h = Hivex::open("../images/minimal", {})
>-    assert_not_nil (h)
>+    refute_nil (h)
>   end
> end
>Index: hivex-1.3.9/ruby/tests/tc_021_close.rb
>===================================================================
>--- hivex-1.3.9.orig/ruby/tests/tc_021_close.rb
>+++ hivex-1.3.9/ruby/tests/tc_021_close.rb
>@@ -15,13 +15,13 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> 
>-require 'test/unit'
>+require File::join(File::dirname(__FILE__), 'test_helper')
> require 'hivex'
> 
>-class TestClose < Test::Unit::TestCase
>+class TestClose < MiniTest::Unit::TestCase
>   def test_close
>     h = Hivex::open("../images/minimal", {})
>-    assert_not_nil (h)
>+    refute_nil (h)
>     h.close()
>   end
> end
>Index: hivex-1.3.9/ruby/tests/tc_120_rlenvalue.rb
>===================================================================
>--- hivex-1.3.9.orig/ruby/tests/tc_120_rlenvalue.rb
>+++ hivex-1.3.9/ruby/tests/tc_120_rlenvalue.rb
>@@ -21,19 +21,19 @@
> # length and offset for this value cell should be 37 bytes, position
> # 8712.
> 
>-require 'test/unit'
>+require File::join(File::dirname(__FILE__), 'test_helper')
> require 'hivex'
> 
>-class TestRLenValue < Test::Unit::TestCase
>+class TestRLenValue < MiniTest::Unit::TestCase
>   def test_RLenValue
>     h = Hivex::open(File::join(ENV['abs_srcdir'], '..', 'images', 'rlenvalue_test_hive'), {})
>-    assert_not_nil(h)
>+    refute_nil(h)
> 
>     root = h.root()
>-    assert_not_nil(root)
>+    refute_nil(root)
> 
>     moderate_value_node = h.node_get_child(root, "ModerateValueParent")
>-    assert_not_nil(moderate_value_node)
>+    refute_nil(moderate_value_node)
> 
>     moderate_value_value = h.node_get_value(moderate_value_node, "33Bytes")
> 
>Index: hivex-1.3.9/ruby/tests/tc_130_special.rb
>===================================================================
>--- hivex-1.3.9.orig/ruby/tests/tc_130_special.rb
>+++ hivex-1.3.9/ruby/tests/tc_130_special.rb
>@@ -1,16 +1,16 @@
> # -*- coding: utf-8 -*-
> # -*- ruby -*-
> 
>-require 'test/unit'
>+require File::join(File::dirname(__FILE__), 'test_helper')
> require 'hivex'
> 
>-class TestRLenValue < Test::Unit::TestCase
>+class TestRLenValue < MiniTest::Unit::TestCase
>   def test_RLenValue
>     h = Hivex::open(File::join(ENV['abs_srcdir'], '..', 'images', 'special'), {})
>-    assert_not_nil(h)
>+    refute_nil(h)
> 
>     root = h.root()
>-    assert_not_nil(root)
>+    refute_nil(root)
> 
>     nodes = h.node_children (root)
>     node = nodes.find { |n| h.node_name(n) == "abcd_Ã¤Ã¶Ã¼Ã" }
>Index: hivex-1.3.9/ruby/tests/tc_200_write.rb
>===================================================================
>--- hivex-1.3.9.orig/ruby/tests/tc_200_write.rb
>+++ hivex-1.3.9/ruby/tests/tc_200_write.rb
>@@ -15,13 +15,13 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> 
>-require 'test/unit'
>+require File::join(File::dirname(__FILE__), 'test_helper')
> require 'hivex'
> 
>-class TestWrite < Test::Unit::TestCase
>+class TestWrite < MiniTest::Unit::TestCase
>   def test_write
>     h = Hivex::open("../images/minimal", {:write => 1})
>-    assert_not_nil (h)
>+    refute_nil (h)
> 
>     root = h.root()
>     assert (root)
>Index: hivex-1.3.9/ruby/tests/tc_210_setvalue.rb
>===================================================================
>--- hivex-1.3.9.orig/ruby/tests/tc_210_setvalue.rb
>+++ hivex-1.3.9/ruby/tests/tc_210_setvalue.rb
>@@ -15,13 +15,13 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> 
>-require 'test/unit'
>+require File::join(File::dirname(__FILE__), 'test_helper')
> require 'hivex'
> 
>-class TestSetValue < Test::Unit::TestCase
>+class TestSetValue < MiniTest::Unit::TestCase
>   def test_set_value
>     h = Hivex::open("../images/minimal", {:write => 1})
>-    assert_not_nil (h)
>+    refute_nil (h)
> 
>     root = h.root()
>     assert (root)
>Index: hivex-1.3.9/ruby/tests/test_helper.rb
>===================================================================
>--- /dev/null
>+++ hivex-1.3.9/ruby/tests/test_helper.rb
>@@ -0,0 +1,29 @@
>+# hivex 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.
>+
>+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

Actions: View

Attachments on bug 1090407: 888822