Km/fix timeout error (#82)

* revert timeout loop logic

* update changelog

* add a timer test

Author: KazuCocoa

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Enhancements
 
 ### Bug fixes
+- Revert timeout logic in `1.4.1`
 
 ### Deprecations
 

lib/appium_lib_core/common/wait.rb

@@ -32,13 +32,17 @@ def until(timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, message: nil, ig
           ignored = Array(ignored || ::Exception)
 
           last_error = nil
-
-          begin
-            run_with_timer(timeout, interval) { return yield(object) }
-          rescue ::Errno::ECONNREFUSED => e
-            raise e
-          rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
-            # swallowed
+          timer = Wait::Timer.new(timeout)
+
+          until timer.timeout?
+            begin
+              return yield(object)
+            rescue ::Errno::ECONNREFUSED => e
+              raise e
+            rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+              # swallowed
+            end
+            sleep interval
           end
 
           msg = message_for timeout, message
@@ -72,16 +76,18 @@ def until_true(timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, message: ni
           ignored = Array(ignored || ::Exception)
 
           last_error = nil
+          timer = Wait::Timer.new(timeout)
 
-          begin
-            run_with_timer(timeout, interval) do
+          until timer.timeout?
+            begin
               result = yield(object)
               return result if result
+            rescue ::Errno::ECONNREFUSED => e
+              raise e
+            rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+              # swallowed
             end
-          rescue ::Errno::ECONNREFUSED => e
-            raise e
-          rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
-            # swallowed
+            sleep interval
           end
 
           msg = message_for timeout, message
@@ -97,17 +103,6 @@ def message_for(timeout, message)
           msg << ", #{message}" if message
           msg
         end
-
-        def run_with_timer(timeout, interval, &block)
-          if timeout.zero?
-            block.call # rubocop:disable Performance/RedundantBlockCall
-          else
-            Timer.wait timeout do
-              block.call # rubocop:disable Performance/RedundantBlockCall
-              sleep interval
-            end
-          end
-        end
       end # self
     end # module Wait
 

lib/appium_lib_core/common/wait/timer.rb

@@ -1,30 +1,25 @@
 module Appium
   module Core
     module Wait
-      module Timer
-        class << self
-          # @private
-          def wait(timeout, &block)
-            end_time = current_time + timeout
-            loop do
-              yield(block)
-              break if current_time > end_time
-            end
-          end
+      class Timer
+        def initialize(timeout)
+          @end_time = current_time + timeout
+        end
 
-          private
+        def timeout?
+          current_time > @end_time
+        end
 
-          if defined?(Process::CLOCK_MONOTONIC)
-            def current_time
-              Process.clock_gettime(Process::CLOCK_MONOTONIC)
-            end
-          else
-            def current_time
-              ::Time.now.to_f
-            end
+        if defined?(Process::CLOCK_MONOTONIC)
+          def current_time
+            Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          end
+        else
+          def current_time
+            ::Time.now.to_f
           end
         end
-      end # module Timer
+      end # class Timer
     end # module Wait
   end # module Core
 end # module Appium

test/unit/common/timer_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class AppiumLibCoreTest
+  class TimterTest < Minitest::Test
+    def test_timer
+      timeout = 0.3
+
+      timer = ::Appium::Core::Wait::Timer.new(timeout)
+      start = timer.current_time
+
+      count = 0
+      until timer.timeout?
+        count += 1
+        sleep 0.1
+      end
+
+      assert_equal 3, count
+      assert timeout <= timer.current_time - start
+    end
+  end
+end