From c7f3743949e79f9aea17ce40552481c501ab770e Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Thu, 16 Apr 2015 17:31:56 +0000
Subject: [PATCH 1/3] Configure uhwm_wait_output test helper via the env

  The `timeout' keyword argument was never used, replace it with a test
for UHWMTEST_OUTPUT_TIMEOUT environment variable and use the value when
set.
---
 lib/uh/wm/testing/acceptance_helpers.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/uh/wm/testing/acceptance_helpers.rb b/lib/uh/wm/testing/acceptance_helpers.rb
index f157cf3..9b38ed7 100644
--- a/lib/uh/wm/testing/acceptance_helpers.rb
+++ b/lib/uh/wm/testing/acceptance_helpers.rb
@@ -22,7 +22,10 @@ module Uh
           @process.stdout
         end
 
-        def uhwm_wait_output message, timeout: 1
+        def uhwm_wait_output message
+          timeout = ENV.key?('UHWMTEST_OUTPUT_TIMEOUT') ?
+            ENV['UHWMTEST_OUTPUT_TIMEOUT'].to_i :
+            1
           Timeout.timeout(timeout) do
             loop do
               break if case message

From e899240d70e7c926bd44f142270b023520c0ae2a Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Thu, 16 Apr 2015 17:33:22 +0000
Subject: [PATCH 2/3] Increase output check timeout to 8" under CI

---
 features/support/env.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/features/support/env.rb b/features/support/env.rb
index 1428a0b..20fd06f 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -27,3 +27,7 @@ end
 Around '@other_wm_running' do |_, block|
   with_other_wm { block.call }
 end
+
+if ENV.key? 'TRAVIS'
+  ENV['UHWMTEST_OUTPUT_TIMEOUT'] = 8.to_s
+end

From 078254ae6d287a33333ee5c8b8c1b8833fa91ada Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Thu, 16 Apr 2015 18:02:13 +0000
Subject: [PATCH 3/3] Simplify and refactor uhwm_wait_output helper

---
 features/support/env.rb                 |  2 +-
 lib/uh/wm/testing/acceptance_helpers.rb | 48 ++++++++++++++++---------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/features/support/env.rb b/features/support/env.rb
index 20fd06f..3a7fcfc 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -29,5 +29,5 @@ Around '@other_wm_running' do |_, block|
 end
 
 if ENV.key? 'TRAVIS'
-  ENV['UHWMTEST_OUTPUT_TIMEOUT'] = 8.to_s
+  ENV['UHWMTEST_TIMEOUT'] = 8.to_s
 end
diff --git a/lib/uh/wm/testing/acceptance_helpers.rb b/lib/uh/wm/testing/acceptance_helpers.rb
index 9b38ed7..bf5d05b 100644
--- a/lib/uh/wm/testing/acceptance_helpers.rb
+++ b/lib/uh/wm/testing/acceptance_helpers.rb
@@ -23,25 +23,17 @@ module Uh
         end
 
         def uhwm_wait_output message
-          timeout = ENV.key?('UHWMTEST_OUTPUT_TIMEOUT') ?
-            ENV['UHWMTEST_OUTPUT_TIMEOUT'].to_i :
-            1
-          Timeout.timeout(timeout) do
-            loop do
-              break if case message
-                when Regexp then @process.stdout + @process.stderr =~ message
-                when String then assert_partial_output_interactive message
-              end
-              sleep 0.1
+          output = -> { @process.stdout + @process.stderr }
+          timeout_until do
+            case message
+              when Regexp then output.call =~ message
+              when String then assert_partial_output_interactive message
             end
           end
-        rescue Timeout::Error
-          output = (@process.stdout + @process.stderr).lines
-            .map { |e| "  #{e}" }
-            .join
+        rescue TimeoutError => e
           fail [
-            "expected `#{message}' not seen after #{timeout} seconds in:",
-            "  ```\n#{output}  ```"
+            "expected `#{message}' not seen after #{e.timeout} seconds in:",
+            "  ```\n#{output.call.lines.map { |e| "  #{e}" }.join}  ```"
           ].join "\n"
         end
 
@@ -93,6 +85,30 @@ module Uh
 
         private
 
+        def timeout_until
+          timeout = ENV.key?('UHWMTEST_TIMEOUT') ?
+            ENV['UHWMTEST_TIMEOUT'].to_i :
+            1
+          Timeout.timeout(timeout) do
+            loop do
+              break if yield
+              sleep 0.1
+            end
+          end
+        rescue Timeout::Error
+          fail TimeoutError.new('execution expired', timeout)
+        end
+
+
+        class TimeoutError < ::StandardError
+          attr_reader :timeout
+
+          def initialize message, timeout
+            super message
+            @timeout = timeout
+          end
+        end
+
         class XClient
           attr_reader :name