[SCM] ci-tooling packaging branch, master, updated. 893c0e69e5a883f027ea496f0e2a302f95ed44df

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=d364251

The following commit has been merged in the master branch:
commit d3642510c32f04626b9b3d66750c3151dc8c4ae4
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 16 16:43:46 2015 +0100

    call super setup from assert modules
---
 test/lib/assert_backtick.rb | 2 ++
 test/lib/assert_system.rb   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/test/lib/assert_backtick.rb b/test/lib/assert_backtick.rb
index d77a5e5..f110120 100644
--- a/test/lib/assert_backtick.rb
+++ b/test/lib/assert_backtick.rb
@@ -10,12 +10,14 @@ module AssertBacktick
   def setup
     Kernel.send(:alias_method, SETUP_BACKUP, METHOD)
     Kernel.send(:define_method, METHOD) { |*_a| }
+    super if defined?(super)
   end
 
   # TestUnit prepend to remove alias diversion making #{Kernel.`} noop
   def teardown
     Kernel.send(:alias_method, METHOD, SETUP_BACKUP)
     Kernel.send(:undef_method, SETUP_BACKUP)
+    super if defined?(super)
   end
 
   # Assert that a specific system call is made. The call itself is not made.
diff --git a/test/lib/assert_system.rb b/test/lib/assert_system.rb
index ccf3376..4b2f25c 100644
--- a/test/lib/assert_system.rb
+++ b/test/lib/assert_system.rb
@@ -10,12 +10,14 @@ module AssertSystem
   def setup
     Kernel.send(:alias_method, SETUP_BACKUP, METHOD)
     Kernel.send(:define_method, METHOD) { |*_a| }
+    super if defined?(super)
   end
 
   # TestUnit prepend to remove alias diversion making #{Kernel.system} noop
   def teardown
     Kernel.send(:alias_method, METHOD, SETUP_BACKUP)
     Kernel.send(:undef_method, SETUP_BACKUP)
+    super if defined?(super)
   end
 
   # Assert that a specific system call is made. The call itself is not made.

-- 
ci-tooling packaging