aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qtip/base/constant.py1
-rw-r--r--tests/unit/loader/metric_test.py8
-rw-r--r--tox.ini4
3 files changed, 9 insertions, 4 deletions
diff --git a/qtip/base/constant.py b/qtip/base/constant.py
index ddd07e9d..39572040 100644
--- a/qtip/base/constant.py
+++ b/qtip/base/constant.py
@@ -34,6 +34,7 @@ class BaseProp(object):
# content
DESCRIPTION = 'description'
+ WORKLOADS = 'workloads'
class SpecProp(BaseProp):
diff --git a/tests/unit/loader/metric_test.py b/tests/unit/loader/metric_test.py
index 91d0dd2c..26f144af 100644
--- a/tests/unit/loader/metric_test.py
+++ b/tests/unit/loader/metric_test.py
@@ -27,8 +27,8 @@ def init_test(metric_spec):
in str(excinfo.value)
-def list_all_test():
- metric_list = MetricSpec.list_all()
+def list_all_test(benchmarks_root):
+ metric_list = MetricSpec.list_all(paths=[benchmarks_root])
assert len(list(metric_list)) is 6
for desc in metric_list:
assert BaseProp.NAME in desc
@@ -37,8 +37,8 @@ def list_all_test():
assert BaseProp.ABSPATH is not None
-def content_test(metric):
- content = metric.content
+def content_test(metric_spec):
+ content = metric_spec.content
assert BaseProp.NAME in content
assert BaseProp.DESCRIPTION in content
assert BaseProp.WORKLOADS in content
diff --git a/tox.ini b/tox.ini
index 16d6188c..0d704b25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,3 +39,7 @@ deps=-rtest-requirements.txt
commands=
pip-missing-reqs qtip
pip-extra-reqs qtip
+
+[pytest]
+testpaths = tests
+python_functions = *_test test_*