strategy: decorate strategy's transition()/force() with @never_retry

In order to get the word out about the @never_retry decorator, decorate
the strategies in labgrid with it.

Signed-off-by: Bastian Krause <[email protected]>

Author: Bastian-Krause

labgrid/strategy/bareboxstrategy.py

@@ -4,7 +4,7 @@
 
 from ..factory import target_factory
 from ..step import step
-from .common import Strategy, StrategyError
+from .common import Strategy, StrategyError, never_retry
 
 
 class Status(enum.Enum):
@@ -30,6 +30,7 @@ class BareboxStrategy(Strategy):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
 
+    @never_retry
     @step(args=['status'])
     def transition(self, status, *, step):  # pylint: disable=redefined-outer-name
         if not isinstance(status, Status):
@@ -63,6 +64,7 @@ def transition(self, status, *, step):  # pylint: disable=redefined-outer-name
             )
         self.status = status
 
+    @never_retry
     @step(args=['status'])
     def force(self, status):
         if not isinstance(status, Status):

labgrid/strategy/dockerstrategy.py

@@ -3,7 +3,7 @@
 import attr
 
 from ..factory import target_factory
-from .common import Strategy, StrategyError
+from .common import Strategy, StrategyError, never_retry
 from ..driver.dockerdriver import DockerDriver
 from ..step import step
 
@@ -33,6 +33,7 @@ class DockerStrategy(Strategy):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
 
+    @never_retry
     @step(args=['status'])
     def transition(self, status):
         if not isinstance(status, Status):

labgrid/strategy/shellstrategy.py

@@ -4,7 +4,7 @@
 
 from ..factory import target_factory
 from ..step import step
-from .common import Strategy, StrategyError
+from .common import Strategy, StrategyError, never_retry
 
 
 class Status(enum.Enum):
@@ -28,6 +28,7 @@ class ShellStrategy(Strategy):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
 
+    @never_retry
     @step(args=['status'])
     def transition(self, status, *, step):  # pylint: disable=redefined-outer-name
         if not isinstance(status, Status):
@@ -53,6 +54,7 @@ def transition(self, status, *, step):  # pylint: disable=redefined-outer-name
             )
         self.status = status
 
+    @never_retry
     @step(args=['status'])
     def force(self, status, *, step):  # pylint: disable=redefined-outer-name
         if not isinstance(status, Status):

labgrid/strategy/ubootstrategy.py

@@ -3,7 +3,7 @@
 import attr
 
 from ..factory import target_factory
-from .common import Strategy, StrategyError
+from .common import Strategy, StrategyError, never_retry
 
 
 class Status(enum.Enum):
@@ -29,6 +29,7 @@ class UBootStrategy(Strategy):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
 
+    @never_retry
     def transition(self, status):
         if not isinstance(status, Status):
             status = Status[status]
@@ -58,6 +59,7 @@ def transition(self, status):
             raise StrategyError(f"no transition found from {self.status} to {status}")
         self.status = status
 
+    @never_retry
     def force(self, status):
         if not isinstance(status, Status):
             status = Status[status]

tests/test_docker.py

@@ -308,10 +308,18 @@ def test_docker_without_daemon(docker_env, mocker):
     with pytest.raises(StrategyError):
         strategy.transition("unknown")
 
+    # test and reset broken state
+    assert isinstance(strategy.broken, StrategyError)
+    strategy.broken = None
+
     # Also bonus: How are invalid state names handled?
-    with pytest.raises(KeyError):
+    with pytest.raises(StrategyError):
         strategy.transition("this is not a valid state")
 
+    # test and reset broken state
+    assert isinstance(strategy.broken, KeyError)
+    strategy.broken = None
+
     # Return to "gone" state - to also use that part of the DockerDriver code.
     strategy.transition("gone")
     from labgrid.strategy.dockerstrategy import Status