[SCM] ci-tooling packaging branch, master, updated. 3e0962e5ec74a4adcfa544277378176c3f5307b1

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 00cf203c76bda6f17535095507a08da77b9fff99
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 12 11:26:35 2015 +0200

    assert_system/backtick should warn when a call is not actually happening
---
 test/lib/assert_backtick.rb | 3 +++
 test/lib/assert_system.rb   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/test/lib/assert_backtick.rb b/test/lib/assert_backtick.rb
index 752e34c..eaaba0b 100644
--- a/test/lib/assert_backtick.rb
+++ b/test/lib/assert_backtick.rb
@@ -33,6 +33,7 @@ module AssertBacktick
         assertee.assert_equal([*args.shift], [*a])
       elsif !args.empty?
         assertee.assert_equal([*args], [*a])
+        args.clear
       end
       if assertee.respond_to?(:backtick_intercept)
         return assertee.backtick_intercept([*a])
@@ -40,6 +41,8 @@ module AssertBacktick
       ''
     end
     block.yield
+    assert(args.empty?, 'Not all system calls were actually called.' \
+                        " Left over: #{args}")
   ensure
     Kernel.send(:alias_method, METHOD, ASSERT_BACKUP)
     Kernel.send(:undef_method, ASSERT_BACKUP)
diff --git a/test/lib/assert_system.rb b/test/lib/assert_system.rb
index 97c2970..8a51681 100644
--- a/test/lib/assert_system.rb
+++ b/test/lib/assert_system.rb
@@ -33,6 +33,7 @@ module AssertSystem
         assertee.assert_equal([*args.shift], [*a])
       elsif !args.empty?
         assertee.assert_equal([*args], [*a])
+        args.clear
       end
       if assertee.respond_to?(:system_intercept)
         return assertee.system_intercept([*a])
@@ -40,6 +41,8 @@ module AssertSystem
       true
     end
     block.yield
+    assert(args.empty?, 'Not all system calls were actually called.' \
+                        " Left over: #{args}")
   ensure
     Kernel.send(:alias_method, METHOD, ASSERT_BACKUP)
     Kernel.send(:undef_method, ASSERT_BACKUP)

-- 
ci-tooling packaging