diff options
author | drebs <drebs@leap.se> | 2017-07-09 11:14:29 -0300 |
---|---|---|
committer | drebs <drebs@leap.se> | 2017-07-09 11:14:29 -0300 |
commit | 0ab7340e571ea7472018a67e6a0d5dad614eccb4 (patch) | |
tree | 456d1f6dca9e507bd834259195d8448aa682a9f1 /testing/tests/conftest.py | |
parent | 2bc92608cb41acb852a77270326c2a51fecc82bb (diff) |
[benchmarks] separate memory sampling from cpu measurement
Diffstat (limited to 'testing/tests/conftest.py')
-rw-r--r-- | testing/tests/conftest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testing/tests/conftest.py b/testing/tests/conftest.py index 994b1610..16ab699d 100644 --- a/testing/tests/conftest.py +++ b/testing/tests/conftest.py @@ -44,10 +44,10 @@ def pytest_addoption(parser): # the following option is only used in benchmarks, but has to be defined # here due to how pytest discovers plugins during startup. parser.addoption( - "--watch-resources", default=False, action="store_true", - help="whether to monitor CPU and memory percentages during test run. " - "**Warning**: enabling this will impact the time taken by the " - "benchmarked code, so use with caution!") + "--watch-memory", default=False, action="store_true", + help="whether to monitor memory percentages during test run. " + "**Warning**: enabling this will impact the time taken and the " + "CPU used by the benchmarked code, so use with caution!") @pytest.fixture |