Merge branch 'master' into cve-2020-14343

Author: joshuaroot

CHANGELOG.md

@@ -4,6 +4,15 @@
 
 [Unreleased]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.16.0...HEAD
 
+### Added
+
+- Activities can be requested not to be executed on a per activity basis, not
+  just as all or none. This can be used by a control to dynamically make
+  a decision on what to run.
+- Test that demonstrate how to wrap controls into decorators [#197][197]
+
+[197]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/197
+
 ## [1.16.0][] - 2020-12-02
 
 [1.16.0]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.15.1...1.16.0

chaoslib/activity.py

@@ -144,6 +144,7 @@ def execute_activity(experiment: Experiment, activity: Activity,
 
     with controls(level="activity", experiment=experiment, context=activity,
                   configuration=configuration, secrets=secrets) as control:
+        dry = activity.get("dry", dry)
         pauses = activity.get("pauses", {})
         pause_before = pauses.get("before")
         if pause_before:

requirements-dev.txt

@@ -1,7 +1,8 @@
 requests-mock
 coverage
 pycodestyle
-pytest>=2.8
+pytest~=5.0; python_version < '3.6'
+pytest~=6.2; python_version >= '3.6'
 pytest-cov
 pytest-sugar
 ply==3.4

tests/fixtures/controls/dummy_with_decorated_control.py

@@ -0,0 +1,40 @@
+from functools import wraps
+from itertools import count
+from typing import Callable
+
+from logzero import logger
+
+from chaoslib.types import Journal
+
+counter = None
+
+
+def initcounter(f: Callable) -> Callable:
+    @wraps(f)
+    def wrapped(*args, **kwargs) -> None:
+        global counter
+        counter = count()
+        f(*args, **kwargs)
+    return wrapped
+
+
+def keepcount(f: Callable) -> Callable:
+    @wraps(f)
+    def wrapped(*args, **kwargs) -> None:
+        next(counter)
+        f(*args, **kwargs)
+    return wrapped
+
+
+@keepcount
+def after_activity_control(**kwargs):
+    logger.info("Activity is called")
+
+
+@initcounter
+def configure_control(**kwargs):
+    logger.info("configure is called")
+
+
+def after_experiment_control(state: Journal, **kwargs):
+    state["counted_activities"] = next(counter)

tests/fixtures/experiments.py

@@ -310,6 +310,17 @@
     }
 ]
 
+ExperimentWithDecoratedControls = deepcopy(ExperimentNoControls)
+ExperimentWithDecoratedControls["controls"] = [
+    {
+        "name": "dummy",
+        "provider": {
+            "type": "python",
+            "module": "fixtures.controls.dummy_with_decorated_control"
+        }
+    }
+]
+
 ExperimentWithControlsRequiringSecrets = deepcopy(ExperimentWithControls)
 ExperimentWithControlsRequiringSecrets["secrets"] = {
     "mystuff": {
@@ -1003,3 +1014,21 @@
         }
     ]
 }
+
+ExperimentWithBypassedActivity = {
+    "version": "1.0.0",
+    "title": "do stuff",
+    "description": "n/a",
+    "method": [
+        {
+            "type": "action",
+            "name": "say-hello",
+            "dry": True,
+            "provider": {
+                "type": "process",
+                "path": "echo",
+                "arguments": "hello"
+            }
+        }
+    ]
+}

tests/test_control.py

@@ -580,3 +580,9 @@ def test_secrets_are_passed_to_all_control_hookpoints():
             "after_hypothesis_control", "before_activity_control",
             "after_activity_control"):
         assert exp["{}_secrets".format(hookpoint)] == secrets, "{} was not provided the secrets".format(hookpoint)
+
+
+def test_control_can_be_decorated_functions():
+    exp = deepcopy(experiments.ExperimentWithDecoratedControls)
+    state = run_experiment(exp)
+    assert state["counted_activities"] == 4

tests/test_experiment.py

@@ -137,6 +137,13 @@ def test_can_run_experiment_in_dry_mode():
     assert isinstance(journal, dict)
 
 
+def test_can_run_experiment_with_activity_in_dry_mode():
+    experiment = experiments.ExperimentWithBypassedActivity.copy()
+    journal = run_experiment(experiment)
+    assert isinstance(journal, dict)
+    assert journal["run"][0]["output"] == None
+
+
 def test_can_iterate_over_activities():
     g = run_activities(
         experiments.Experiment, configuration=None, secrets=None, pool=None,