Don't return bool on strategy eval

benmezger · May 3, 2024 · a1a4482 · a1a4482
1 parent cec9648
commit a1a4482
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/pyretries/strategy.py b/pyretries/strategy.py
@@ -39,7 +39,7 @@ def should_stop(self) -> bool:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def eval(self, value: StrategyValueT | Exception | None) -> bool:
+    def eval(self, value: StrategyValueT | Exception | None):
         """
         Evaluates strategy.
 
@@ -81,7 +81,7 @@ def should_stop(self) -> bool:
             return True
         return False
 
-    def eval(self, value: StrategyValueT | Exception | None) -> bool:
+    def eval(self, value: StrategyValueT | Exception | None):
         """
         Evaluates strategy.
 
@@ -103,7 +103,6 @@ def eval(self, value: StrategyValueT | Exception | None) -> bool:
             _logger.info(f"{self.__class__.__name__} is at {self.current_attempt=}")
 
         self.current_attempt += 1
-        return True
 
 
 class SleepStrategy(Strategy, t.Generic[StrategyValueT]):
@@ -132,7 +131,7 @@ def should_stop(self) -> bool:
             return True
         return False
 
-    def eval(self, value: StrategyValueT | Exception | None) -> bool:
+    def eval(self, value: StrategyValueT | Exception | None):
         """
         Evaluates strategy.
 
@@ -159,8 +158,6 @@ def eval(self, value: StrategyValueT | Exception | None) -> bool:
             )
         time.sleep(self.seconds)
 
-        return True
-
 
 class NoopStrategy(Strategy, t.Generic[StrategyValueT]):
     "Do nothing strategy"
@@ -186,7 +183,7 @@ def should_stop(self) -> bool:
             return True
         return False
 
-    def eval(self, value: StrategyValueT | Exception | None) -> bool:
+    def eval(self, value: StrategyValueT | Exception | None):
         """
         Evaluates strategy.
 
@@ -205,7 +202,6 @@ def eval(self, value: StrategyValueT | Exception | None) -> bool:
             )
 
         self.current_attempt += 1
-        return True
 
 
 class StopWhenReturnValueStrategy(Strategy, t.Generic[StrategyValueT]):
@@ -237,7 +233,7 @@ def should_stop(self) -> bool:
                 return True
         return False
 
-    def eval(self, value: StrategyValueT | Exception | None) -> bool:
+    def eval(self, value: StrategyValueT | Exception | None):
         """
         Evaluates strategy.
 
@@ -262,8 +258,6 @@ def eval(self, value: StrategyValueT | Exception | None) -> bool:
                 )
             self.current_attempt += 1
 
-        return not value == self.expected
-
 
 class ExponentialBackoffStrategy(Strategy, t.Generic[StrategyValueT]):
     """Exponential backoff strategy"""
@@ -292,7 +286,7 @@ def should_stop(self) -> bool:
             return True
         return False
 
-    def eval(self, value: StrategyValueT | Exception | None) -> bool:
+    def eval(self, value: StrategyValueT | Exception | None):
         """
         Evaluates strategy.
 
@@ -320,4 +314,4 @@ def eval(self, value: StrategyValueT | Exception | None) -> bool:
             )
 
         time.sleep(self.delay)
-        return True
+
diff --git a/tests/test_strategy.py b/tests/test_strategy.py
@@ -133,7 +133,7 @@ def test_return_value(self, attempts: int):
         s = strategy.StopWhenReturnValueStrategy(expected=attempts, max_attempts=2)
         assert s.current_attempt == 0
 
-        assert s.eval(attempts) is False
+        s.eval(attempts)
         assert s.current_attempt == 1
 
     def test_raises_when_max_attempts(self):