Fix broken tests

Author: CharlesDelannoy

lib/safe-pg-migrations/configuration.rb

@@ -33,7 +33,7 @@ def initialize
     def lock_timeout=(value)
       raise 'Setting lock timeout to 0 disables the lock timeout and is dangerous' if value == 0.seconds
 
-      unless value.nil? || (value < safe_timeout && value < max_lock_timeout_for_retry)
+      unless value.nil? || (value < safe_timeout && value <= max_lock_timeout_for_retry)
         raise ArgumentError, "Lock timeout (#{value}) cannot be greater than the safe timeout (#{safe_timeout}) or the max lock timeout for retry (#{max_lock_timeout_for_retry})"
       end
 
@@ -43,15 +43,15 @@ def lock_timeout=(value)
     def safe_timeout=(value)
       raise 'Setting safe timeout to 0 or nil disables the safe timeout and is dangerous' unless value && value > 0.seconds
 
-      unless lock_timeout.nil? || (value > lock_timeout && value > max_lock_timeout_for_retry)
+      unless lock_timeout.nil? || (value > lock_timeout && value >= max_lock_timeout_for_retry)
         raise ArgumentError, "Safe timeout (#{value}) cannot be lower than the lock timeout (#{lock_timeout}) or the max lock timeout for retry (#{max_lock_timeout_for_retry})"
       end
 
       @safe_timeout = value
     end
 
-    def max_lock_timeout_for_retry(value)
-      unless lock_timeout.nil? || (value > lock_timeout && value < safe_timeout)
+    def max_lock_timeout_for_retry=(value)
+      unless lock_timeout.nil? || (value >= lock_timeout && value <= safe_timeout)
         raise ArgumentError, "Max lock timeout for retry (#{value}) cannot be lower than the lock timeout (#{lock_timeout}) and greater than the safe timeout (#{safe_timeout})"
       end
 

lib/safe-pg-migrations/plugins/statement_retrier.rb

@@ -13,16 +13,19 @@ module StatementRetrier
     private
 
     def retry_if_lock_timeout
-      lock_timeout_step = get_lock_timeout_step(SafePgMigrations.config)
+      initial_lock_timeout = SafePgMigrations.config.lock_timeout
       number_of_retries = 0
       begin
         number_of_retries += 1
         yield
       rescue ActiveRecord::LockWaitTimeout
-        raise if transaction_open? # Retrying is useless if we're inside a transaction.
-        raise if number_of_retries >= max_tries
+        # Retrying is useless if we're inside a transaction.
+        if transaction_open? || number_of_retries >= SafePgMigrations.config.max_tries
+          SafePgMigrations.config.lock_timeout = initial_lock_timeout
+          raise
+        end
 
-        increase_lock_timeout(lock_timeout_step) unless SafePgMigrations.config.lock_timeout.nil?
+        increase_lock_timeout unless SafePgMigrations.config.lock_timeout.nil?
 
         retry_delay = SafePgMigrations.config.retry_delay
         Helpers::Logger.say "Retrying in #{retry_delay} seconds...", sub_item: true
@@ -32,15 +35,15 @@ def retry_if_lock_timeout
       end
     end
 
-    def increase_lock_timeout(lock_timeout_step)
+    def increase_lock_timeout
       SafePgMigrations.config.lock_timeout += lock_timeout_step
       unless SafePgMigrations.config.lock_timeout < SafePgMigrations.config.max_lock_timeout_for_retry
         SafePgMigrations.config.lock_timeout = SafePgMigrations.config.max_lock_timeout_for_retry
       end
     end
 
-    def get_lock_timeout_step(config)
-      (config.max_lock_timeout_for_retry - config.lock_timeout) / config.max_tries
+    def lock_timeout_step
+      (SafePgMigrations.config.max_lock_timeout_for_retry - SafePgMigrations.config.lock_timeout) / SafePgMigrations.config.max_tries
     end
   end
 end

test/statement_retrier_test.rb

@@ -48,4 +48,8 @@ def test_statement_retry
       '   -> Retrying now.',
     ], calls[7..9]
   end
+
+  def lock_timout_increase_on_retry
+
+  end
 end