Add a --benchmark-enable property to forcibly enable benchmarks.

ionelmc · Apr 10, 2016 · b181664 · b181664
1 parent 219fbe3
commit b181664
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/pytest_benchmark/plugin.py b/src/pytest_benchmark/plugin.py
@@ -170,6 +170,12 @@ def pytest_addoption(parser):
         help="Disable benchmarks. Benchmarked functions are only ran once and no stats are reported. Use this is you "
              "want to run the test but don't do any benchmarking."
     )
+    group.addoption(
+        "--benchmark-enable",
+        action="store_true", default=False,
+        help="Forcibly enable benchmarks. Use this option to override --benchmark-disable (in case you have it in "
+             "pytest configuration)."
+    )
     group.addoption(
         "--benchmark-only",
         action="store_true", default=False,

diff --git a/src/pytest_benchmark/session.py b/src/pytest_benchmark/session.py
@@ -45,7 +45,7 @@ def __init__(self, config):
             warmup_iterations=config.getoption("benchmark_warmup_iterations"),
         )
         self.skip = config.getoption("benchmark_skip")
-        self.disable = config.getoption("benchmark_disable")
+        self.disabled = config.getoption("benchmark_disable") and not config.getoption("benchmark_enable")
 
         if config.getoption("dist", "no") != "no" and not self.skip:
             self.logger.warn(