diff options
| -rw-r--r-- | collector/timeline.json | 39 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | qtip/api/__main__.py | 9 | ||||
| -rw-r--r-- | qtip/api/controllers/common.py | 15 | ||||
| -rw-r--r-- | qtip/api/controllers/metric.py | 13 | ||||
| -rw-r--r-- | qtip/api/controllers/plan.py | 25 | ||||
| -rw-r--r-- | qtip/api/controllers/qpi.py | 21 | ||||
| -rw-r--r-- | qtip/api/swagger/swagger.yaml | 64 | ||||
| -rw-r--r-- | qtip/cli/commands/cmd_metric.py | 10 | ||||
| -rw-r--r-- | qtip/cli/commands/cmd_plan.py | 8 | ||||
| -rw-r--r-- | qtip/cli/commands/cmd_qpi.py | 8 | ||||
| -rw-r--r-- | qtip/cli/commands/cmd_report.py | 5 | ||||
| -rw-r--r-- | qtip/collector/parser/regex.yaml | 4 | ||||
| -rw-r--r-- | qtip/reporter/console.py | 12 | ||||
| -rw-r--r-- | qtip/runner/runner.py | 2 | ||||
| -rw-r--r-- | tests/data/reporter/qtip-2017-03-16-20-07/result.json (renamed from collector/2017-03-16-20-07/result.json) | 0 | ||||
| -rw-r--r-- | tests/unit/api/conftest.py | 22 | ||||
| -rw-r--r-- | tests/unit/api/metric_controller_test.py | 37 | ||||
| -rw-r--r-- | tests/unit/api/plan_controller_test.py | 49 | ||||
| -rw-r--r-- | tests/unit/api/qpi_controller_test.py | 43 | ||||
| -rw-r--r-- | tests/unit/cli/cmd_report_test.py | 32 | ||||
| -rw-r--r-- | tests/unit/reporter/console_test.py | 32 |
22 files changed, 280 insertions, 172 deletions
diff --git a/collector/timeline.json b/collector/timeline.json deleted file mode 100644 index dea929e7..00000000 --- a/collector/timeline.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "phases": [{ - "name": "Monitor", - "checkpoints": [{ - "name": "T00", - "timestamp": "1" - }] - }, { - "name": "Inspector", - "checkpoints": [{ - "name": "T01", - "timestamp": "2" - }, { - "name": "T02 ", - "timestamp": "5" - }, { - "name": "T03 ", - "timestamp": "8" - }] - }, { - "name": "Controller", - "checkpoints": [{ - "name": "T04", - "timestamp": "11" - }] - }, { - "name": "Notifier", - "checkpoints": [{ - "name": "T05 ", - "timestamp": "16" - }] - }, { - "name": "Evaluator", - "checkpoints": [{ - "name": "T06 ", - "timestamp": "40" - }] - }] -} diff --git a/docker/Dockerfile b/docker/Dockerfile index d609273d..d6f8fdd6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -62,7 +62,7 @@ RUN git config --global http.sslVerify false RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng -RUN pip install -U -r $REPOS_DIR/qtip/requirements.txt +RUN cd $REPOS_DIR/qtip && pip install -U . #Config supervisor RUN mkdir -p /var/log/supervisor diff --git a/qtip/api/__main__.py b/qtip/api/__main__.py index 05d92315..381622af 100644 --- a/qtip/api/__main__.py +++ b/qtip/api/__main__.py @@ -14,9 +14,14 @@ import os swagger_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), 'swagger/')) -def main(): +def get_app(): app = connexion.App(__name__, specification_dir=swagger_dir) - app.add_api('swagger.yaml', base_path='/v1.0') + app.add_api('swagger.yaml', base_path='/v1.0', strict_validation=True) + return app + + +def main(): + app = get_app() app.run(host="0.0.0.0", port=5000) diff --git a/qtip/api/controllers/common.py b/qtip/api/controllers/common.py index eeae0fee..6ddab7a9 100644 --- a/qtip/api/controllers/common.py +++ b/qtip/api/controllers/common.py @@ -14,15 +14,22 @@ import connexion from qtip.base import error -def get_one_exceptions(resource): +def check_endpoint_for_error(resource, operation=None): def _decorator(func): - def _execute(name): + def _execute(name=None): try: return func(name), httplib.OK except error.NotFoundError: return connexion.problem( httplib.NOT_FOUND, - '{} Not Found'.format(resource), - 'Requested {} `{}` not found.'.format(resource, name)) + '{} not found'.format(resource), + 'Requested {} `{}` not found.' + .format(resource.lower(), name)) + except error.ToBeDoneError: + return connexion.problem( + httplib.NOT_IMPLEMENTED, + '{} handler not implemented'.format(operation), + 'Requested operation `{}` on {} not implemented.' + .format(operation.lower(), resource.lower())) return _execute return _decorator diff --git a/qtip/api/controllers/metric.py b/qtip/api/controllers/metric.py index dd4c8ac6..96cd985c 100644 --- a/qtip/api/controllers/metric.py +++ b/qtip/api/controllers/metric.py @@ -14,13 +14,12 @@ from qtip.loader import metric def list_metrics(): - metric_list = list(metric.MetricSpec.list_all()) - return metric_list, httplib.OK + metrics = list(metric.MetricSpec.list_all()) + metrics_by_name = [m['name'] for m in metrics] + return {'metrics': metrics_by_name}, httplib.OK -@common.get_one_exceptions(resource='metric') +@common.check_endpoint_for_error(resource='Metric') def get_metric(name): - metric_spec = metric.MetricSpec(name) - return {'name': metric_spec.name, - 'abspath': metric_spec.abspath, - 'content': metric_spec.content} + metric_spec = metric.MetricSpec(name) + return metric_spec.content diff --git a/qtip/api/controllers/plan.py b/qtip/api/controllers/plan.py index 93836a32..00593878 100644 --- a/qtip/api/controllers/plan.py +++ b/qtip/api/controllers/plan.py @@ -9,30 +9,23 @@ import httplib -import connexion - +from qtip.api.controllers import common from qtip.base import error from qtip.loader import plan def list_plans(): - plan_list = list(plan.Plan.list_all()) - return plan_list, httplib.OK + plans = list(plan.Plan.list_all()) + plans_by_name = [p['name'] for p in plans] + return {'plans': plans_by_name}, httplib.OK +@common.check_endpoint_for_error(resource='Plan') def get_plan(name): - try: - plan_spec = plan.Plan(name) - return {'name': plan_spec.name, - 'abspath': plan_spec.abspath, - 'content': plan_spec.content}, httplib.OK - except error.NotFoundError: - return connexion.problem(httplib.NOT_FOUND, - 'Plan Not Found', - 'requested plan `' + name + '` not found.') + plan_spec = plan.Plan(name) + return plan_spec.content +@common.check_endpoint_for_error(resource='Plan', operation='Run') def run_plan(name, action="run"): - return connexion.problem(httplib.NOT_IMPLEMENTED, - 'Run a plan', - 'Plan runner not implemented') + raise error.ToBeDoneError('run_plan', 'plan') diff --git a/qtip/api/controllers/qpi.py b/qtip/api/controllers/qpi.py index 3c4dd718..af08a824 100644 --- a/qtip/api/controllers/qpi.py +++ b/qtip/api/controllers/qpi.py @@ -9,24 +9,17 @@ import httplib -import connexion - -from qtip.base import error +from qtip.api.controllers import common from qtip.loader import qpi def list_qpis(): - qpi_spec_list = list(qpi.QPISpec.list_all()) - return qpi_spec_list, httplib.OK + qpi_specs = list(qpi.QPISpec.list_all()) + qpis_by_name = [q['name'] for q in qpi_specs] + return {'qpis': qpis_by_name}, httplib.OK +@common.check_endpoint_for_error(resource='QPI') def get_qpi(name): - try: - qpi_spec = qpi.QPISpec(name) - return {'name': qpi_spec.name, - 'abspath': qpi_spec.abspath, - 'content': qpi_spec.content}, httplib.OK - except error.NotFoundError: - return connexion.problem(httplib.NOT_FOUND, - 'QPI Not Found', - 'Requested QPI Spec `' + name + '` not found.') + qpi_spec = qpi.QPISpec(name) + return qpi_spec.content diff --git a/qtip/api/swagger/swagger.yaml b/qtip/api/swagger/swagger.yaml index c2de2d68..51c3ebb8 100644 --- a/qtip/api/swagger/swagger.yaml +++ b/qtip/api/swagger/swagger.yaml @@ -212,7 +212,7 @@ paths: schema: $ref: '#/definitions/Error' definitions: - PlanContent: + Plan: type: object required: - name @@ -232,23 +232,13 @@ definitions: Plans: type: object required: - - name - - abspath + - plans properties: - name: - type: string - abspath: - type: string - Plan: - allOf: - - $ref: '#/definitions/Plans' - - type: object - - required: - - content - properties: - content: - $ref: '#/definitions/PlanContent' - MetricContent: + plans: + type: array + items: + type: string + Metric: type: object required: - name @@ -268,22 +258,13 @@ definitions: Metrics: type: object required: - - name - - abspath + - metrics properties: - name: - type: string - abspath: - type: string - Metric: - allOf: - - $ref: '#/definitions/Metrics' - - required: - - content - properties: - content: - $ref: '#/definitions/MetricContent' - QPIContent: + metrics: + type: array + items: + type: string + QPI: type: object required: - name @@ -301,21 +282,12 @@ definitions: QPIs: type: object required: - - name - - abspath + - qpis properties: - name: - type: string - abspath: - type: string - QPI: - allOf: - - $ref: '#/definitions/QPIs' - - required: - - content - properties: - content: - $ref: '#/definitions/QPIContent' + qpis: + type: array + items: + type: string Error: type: object properties: diff --git a/qtip/cli/commands/cmd_metric.py b/qtip/cli/commands/cmd_metric.py index 31b7b702..a2208444 100644 --- a/qtip/cli/commands/cmd_metric.py +++ b/qtip/cli/commands/cmd_metric.py @@ -8,6 +8,7 @@ ############################################################################## import click +import os from qtip.cli import utils from qtip.cli.entry import Context @@ -41,8 +42,11 @@ def show(ctx, name): click.echo(output) -@cli.command('run', help='Run tests to run Performance Metrics') +@cli.command('run', help='Run performance test') @click.argument('name') +@click.option('-p', '--path', help='Path to store results') @pass_context -def cmd_run(ctx, name): - pass +def run(ctx, name, path): + runner_path = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir, + 'runner/runner.py') + os.system('python {0} -b {1} -d {2}'.format(runner_path, name, path)) diff --git a/qtip/cli/commands/cmd_plan.py b/qtip/cli/commands/cmd_plan.py index 90773491..beb61b0e 100644 --- a/qtip/cli/commands/cmd_plan.py +++ b/qtip/cli/commands/cmd_plan.py @@ -9,6 +9,7 @@ import click +import os from qtip.cli import utils from qtip.cli.entry import Context @@ -51,6 +52,9 @@ def show(ctx, name): @cli.command('run', help='Execute a Plan') @click.argument('name') +@click.option('-p', '--path', help='Path to store results') @pass_context -def run(ctx, name): - pass +def run(ctx, name, path): + runner_path = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir, + 'runner/runner.py') + os.system('python {0} -b all -d {1}'.format(runner_path, path)) diff --git a/qtip/cli/commands/cmd_qpi.py b/qtip/cli/commands/cmd_qpi.py index 1f23211e..1e3671c5 100644 --- a/qtip/cli/commands/cmd_qpi.py +++ b/qtip/cli/commands/cmd_qpi.py @@ -9,6 +9,7 @@ import click +import os from qtip.cli import utils from qtip.cli.entry import Context @@ -44,6 +45,9 @@ def show(ctx, name): @cli.command('run', help='Run performance tests for the specified QPI') @click.argument('name') +@click.option('-p', '--path', help='Path to store results') @pass_context -def run(ctx, name): - pass +def run(ctx, name, path): + runner_path = path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir, + 'runner/runner.py') + os.system('python {0} -b all -d {1}'.format(runner_path, path)) diff --git a/qtip/cli/commands/cmd_report.py b/qtip/cli/commands/cmd_report.py index cb9c70b6..c9f31f4a 100644 --- a/qtip/cli/commands/cmd_report.py +++ b/qtip/cli/commands/cmd_report.py @@ -24,8 +24,9 @@ def cli(ctx): @cli.command('show') @click.argument('metric') +@click.option('-p', '--path', help='Path to result directory') @pass_context -def show(ctx, metric): +def show(ctx, metric, path): reporter = ConsoleReporter({}) - report = reporter.render(metric) + report = reporter.render(metric, path) click.echo(report) diff --git a/qtip/collector/parser/regex.yaml b/qtip/collector/parser/regex.yaml index 397f8973..94271136 100644 --- a/qtip/collector/parser/regex.yaml +++ b/qtip/collector/parser/regex.yaml @@ -25,8 +25,8 @@ dpi: - filename: dpi_dump.txt grep: - |- - ^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\sM\spps.+ - ?(?P<bps>\d+.\d+)\sGb\/sec + ^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\s.+\spps.+ + ?(?P<bps>\d+.\d+)\s.+\/sec ramspeed: - filename: Intmem grep: diff --git a/qtip/reporter/console.py b/qtip/reporter/console.py index 64d677ba..cb51d9c9 100644 --- a/qtip/reporter/console.py +++ b/qtip/reporter/console.py @@ -28,19 +28,17 @@ class ConsoleReporter(BaseActor): tpl_path = path.join(path.dirname(__file__), 'templates') tpl_loader = FileSystemLoader(tpl_path) self._env = Environment(loader=tpl_loader) - self.result_path = path.join(ROOT_DIR, 'collector') - def load_result(self): - # TODO (taseer) change result directory format more suitable to filter out - result_dirs = glob.glob('{}/20*'.format(self.result_path)) + def load_result(self, result_path): + result_dirs = glob.glob('{}/qtip-*'.format(result_path)) # select the last (latest) directory for rendering report, result_dirs[-1] - with open(path.join(self.result_path, result_dirs[-1], 'result.json')) as sample: + with open(path.join(result_path, result_dirs[-1], 'result.json')) as sample: result = json.load(sample) return result - def render(self, metric): + def render(self, metric, result_path): template = self._env.get_template('base.j2') - var_dict = self.load_result() + var_dict = self.load_result(result_path) var_dict['metric_name'] = metric out = template.render(var_dict) return out diff --git a/qtip/runner/runner.py b/qtip/runner/runner.py index 8bdbfb78..9b09f0f8 100644 --- a/qtip/runner/runner.py +++ b/qtip/runner/runner.py @@ -93,7 +93,7 @@ def main(args=sys.argv[1:]): logger.info("start_time: {0}".format(start_time)) if not args.dest.endswith('/'): args.dest += '/' - result_dir = args.dest + start_time + result_dir = args.dest + 'qtip-' + start_time ansible_result = run_benchmark(result_dir, args.benchmark) stop_time = time.strftime("%Y-%m-%d-%H-%M") logger.info("stop_time: {0}".format(stop_time)) diff --git a/collector/2017-03-16-20-07/result.json b/tests/data/reporter/qtip-2017-03-16-20-07/result.json index d26ad400..d26ad400 100644 --- a/collector/2017-03-16-20-07/result.json +++ b/tests/data/reporter/qtip-2017-03-16-20-07/result.json diff --git a/tests/unit/api/conftest.py b/tests/unit/api/conftest.py new file mode 100644 index 00000000..23a3be82 --- /dev/null +++ b/tests/unit/api/conftest.py @@ -0,0 +1,22 @@ +############################################################################## +# Copyright (c) 2017 akhil.batra@research.iiit.ac.in and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import pytest + +from qtip.api import __main__ + + +@pytest.fixture(scope="session") +def app(): + return __main__.get_app().app + + +@pytest.fixture(scope="session") +def app_client(app): + return app.test_client() diff --git a/tests/unit/api/metric_controller_test.py b/tests/unit/api/metric_controller_test.py new file mode 100644 index 00000000..caba7972 --- /dev/null +++ b/tests/unit/api/metric_controller_test.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2017 akhil.batra@research.iiit.ac.in and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import httplib +import json + +from qtip.base.constant import BaseProp + + +def test_get_list_metrics(app_client): + response_success = app_client.get("/v1.0/metrics") + assert response_success.status_code == httplib.OK + metric_list = json.loads(response_success.data)['metrics'] + assert len(metric_list) > 0 + assert metric_list[0].endswith('.yaml') + + +def test_get_metric(app_client): + response_success = app_client.get("/v1.0/metrics/dpi.yaml") + assert response_success.status_code == httplib.OK + metric_data = json.loads(response_success.data) + assert BaseProp.NAME in metric_data + assert BaseProp.WORKLOADS in metric_data + assert isinstance(metric_data[BaseProp.WORKLOADS], list) + + +def test_get_metric_not_found(app_client): + response_not_found = app_client.get("/v1.0/metrics/fake.yaml") + response_data = json.loads(response_not_found.data) + assert response_not_found.status_code == httplib.NOT_FOUND + assert response_data['title'] == "Metric not found" diff --git a/tests/unit/api/plan_controller_test.py b/tests/unit/api/plan_controller_test.py new file mode 100644 index 00000000..136bd3c6 --- /dev/null +++ b/tests/unit/api/plan_controller_test.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2017 akhil.batra@research.iiit.ac.in and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import httplib +import json + + +from qtip.loader.plan import PlanProp + + +def test_invalid_url(app_client): + response_url_not_found = app_client.get("/v1.0/fakeresource") + assert response_url_not_found.status_code == httplib.NOT_FOUND + + +def test_get_list_plans(app_client): + response_success = app_client.get("/v1.0/plans") + assert response_success.status_code == httplib.OK + plan_list = json.loads(response_success.data)['plans'] + assert len(plan_list) > 0 + assert plan_list[0].endswith('.yaml') + + +def test_get_plan(app_client): + response_success = app_client.get("/v1.0/plans/sample.yaml") + assert response_success.status_code == httplib.OK + plan_data = json.loads(response_success.data) + assert PlanProp.NAME in plan_data + assert PlanProp.DESCRIPTION in plan_data + assert PlanProp.CONFIG in plan_data + assert PlanProp.QPIS in plan_data + + +def test_get_plan_not_found(app_client): + response_not_found = app_client.get("/v1.0/plans/fake.yaml") + response_data = json.loads(response_not_found.data) + assert response_not_found.status_code == httplib.NOT_FOUND + assert response_data['title'] == "Plan not found" + + +def test_runner_not_implemented(app_client): + response_error = app_client.post("/v1.0/plans/fake.yaml?action=run", follow_redirects=False) + assert response_error.status_code == httplib.NOT_IMPLEMENTED diff --git a/tests/unit/api/qpi_controller_test.py b/tests/unit/api/qpi_controller_test.py new file mode 100644 index 00000000..6291dd9b --- /dev/null +++ b/tests/unit/api/qpi_controller_test.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2017 akhil.batra@research.iiit.ac.in and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import httplib +import json + +from qtip.base.constant import FormulaName +from qtip.base.constant import SpecProp + + +def test_get_list_qpis(app_client): + response_success = app_client.get("/v1.0/qpis") + assert response_success.status_code == httplib.OK + qpi_spec_list = json.loads(response_success.data)['qpis'] + assert len(qpi_spec_list) > 0 + assert qpi_spec_list[0].endswith('.yaml') + + +def test_get_qpi(app_client): + response_success = app_client.get("/v1.0/qpis/compute.yaml") + assert response_success.status_code == httplib.OK + qpi_data = json.loads(response_success.data) + assert SpecProp.DESCRIPTION in qpi_data + assert SpecProp.FORMULA in qpi_data + assert SpecProp.SECTIONS in qpi_data + assert qpi_data[SpecProp.FORMULA] in FormulaName.__dict__.values() + sections = qpi_data[SpecProp.SECTIONS] + assert isinstance(sections, list) + for section in sections: + assert SpecProp.NAME in section + + +def test_get_qpi_not_found(app_client): + response_not_found = app_client.get("/v1.0/qpis/fake.yaml") + response_data = json.loads(response_not_found.data) + assert response_not_found.status_code == httplib.NOT_FOUND + assert response_data['title'] == "QPI not found" diff --git a/tests/unit/cli/cmd_report_test.py b/tests/unit/cli/cmd_report_test.py index 963ce987..9263707f 100644 --- a/tests/unit/cli/cmd_report_test.py +++ b/tests/unit/cli/cmd_report_test.py @@ -8,6 +8,7 @@ ############################################################################## import pytest +from os import path from click.testing import CliRunner from qtip.cli.entry import cli @@ -18,10 +19,17 @@ def runner(): return CliRunner() -def test_dhrystone(runner): +@pytest.fixture(scope="module") +def result_path(): + result = path.join(path.dirname(__file__), path.pardir, path.pardir, + 'data/reporter') + return result + + +def test_dhrystone(runner, result_path): """Test dhrystone report""" - result = runner.invoke(cli, ['report', 'show', 'dhrystone']) + result = runner.invoke(cli, ['report', 'show', 'dhrystone', '-p', result_path]) assert "Benchmark: dhrystone" in result.output assert "CPU Usage: 3%" in result.output assert "Number: 40" in result.output @@ -30,10 +38,10 @@ def test_dhrystone(runner): assert "Total CPUs: 40" in result.output -def test_whetstone(runner): +def test_whetstone(runner, result_path): """ Test whetstone output""" - result = runner.invoke(cli, ['report', 'show', 'whetstone']) + result = runner.invoke(cli, ['report', 'show', 'whetstone', '-p', result_path]) assert "Benchmark: whetstone" in result.output assert "CPU Usage: 3%" in result.output assert "Results:" in result.output @@ -43,9 +51,9 @@ def test_whetstone(runner): assert "Single CPU:" in result.output -def test_dpi(runner): +def test_dpi(runner, result_path): """ Test dpi report""" - result = runner.invoke(cli, ['report', 'show', 'dpi']) + result = runner.invoke(cli, ['report', 'show', 'dpi', '-p', result_path]) assert "Benchmark: dpi" in result.output assert "CPU Usage: 3%" in result.output assert "Bits per Second: 3.638" in result.output @@ -54,9 +62,9 @@ def test_dpi(runner): assert "Packets per Second: 1.458" in result.output -def test_ramspeed(runner): +def test_ramspeed(runner, result_path): """ Test ramspeed report """ - result = runner.invoke(cli, ['report', 'show', 'ramspeed']) + result = runner.invoke(cli, ['report', 'show', 'ramspeed', '-p', result_path]) assert "Benchmark: ramspeed" in result.output assert "CPU Usage: 3%" in result.output assert "Float Addition: 10217.62" in result.output @@ -68,10 +76,10 @@ def test_ramspeed(runner): assert "Integer Average: 11396.35" in result.output -def test_ssl(runner): +def test_ssl(runner, result_path): """ Test ssl report""" - result = runner.invoke(cli, ['report', 'show', 'ssl']) + result = runner.invoke(cli, ['report', 'show', 'ssl', '-p', result_path]) assert "Benchmark: ssl" in result.output assert "CPU Usage: 3%" in result.output assert "AES 128 CBC (bytes):" in result.output @@ -82,10 +90,10 @@ def test_ssl(runner): assert "4096: 7688.5" in result.output -def test_sys(runner): +def test_sys(runner, result_path): """ Test sys_info """ - result = runner.invoke(cli, ['report', 'show', 'ssl']) + result = runner.invoke(cli, ['report', 'show', 'ssl', '-p', result_path]) assert "System Information:" in result.output assert "Host Name: node-38.zte.com.cn" in result.output assert "Memory: 4403.7/128524.1MB" in result.output diff --git a/tests/unit/reporter/console_test.py b/tests/unit/reporter/console_test.py index aa7f848b..037ef2fb 100644 --- a/tests/unit/reporter/console_test.py +++ b/tests/unit/reporter/console_test.py @@ -8,6 +8,7 @@ ############################################################################## import pytest +from os import path from qtip.reporter.console import ConsoleReporter @@ -17,14 +18,21 @@ def console_reporter(): return ConsoleReporter({}) +@pytest.fixture +def result_path(): + result = path.join(path.dirname(__file__), path.pardir, path.pardir, + 'data/reporter') + return result + + def test_constructor(console_reporter): assert isinstance(console_reporter, ConsoleReporter) -def test_dhrystone(console_reporter): +def test_dhrystone(console_reporter, result_path): """ Test dhrystone report""" - result = console_reporter.render('dhrystone') + result = console_reporter.render('dhrystone', result_path) assert "Benchmark: dhrystone" in result assert "Number: 40" in result assert "Score: 63529.6" in result @@ -32,10 +40,10 @@ def test_dhrystone(console_reporter): assert "Total CPUs: 40" in result -def test_whetstone(console_reporter): +def test_whetstone(console_reporter, result_path): """ Test whetstone output""" - result = console_reporter.render('whetstone') + result = console_reporter.render('whetstone', result_path) assert "Benchmark: whetstone" in result assert "Results:" in result assert "Multi CPU:" in result @@ -44,10 +52,10 @@ def test_whetstone(console_reporter): assert "Single CPU:" in result -def test_dpi(console_reporter): +def test_dpi(console_reporter, result_path): """ Test dpi report""" - result = console_reporter.render('dpi') + result = console_reporter.render('dpi', result_path) assert "Benchmark: dpi" in result assert "Bits per Second: 3.638" in result assert "Packets per Second: 1.45" in result @@ -55,10 +63,10 @@ def test_dpi(console_reporter): assert "Packets per Second: 1.458" in result -def test_ramspeed(console_reporter): +def test_ramspeed(console_reporter, result_path): """ Test ramspeed report """ - result = console_reporter.render('ramspeed') + result = console_reporter.render('ramspeed', result_path) assert "Float Addition: 10217.62" in result assert "Float Average: 9176.88" in result assert "Float Copy: 8127.13" in result @@ -68,10 +76,10 @@ def test_ramspeed(console_reporter): assert "Integer Average: 11396.35" in result -def test_ssl(console_reporter): +def test_ssl(console_reporter, result_path): """ Test ssl report""" - result = console_reporter.render('ssl') + result = console_reporter.render('ssl', result_path) assert "AES 128 CBC (bytes):" in result assert "256: 584951.30k" in result assert "RSA SIGN:" in result @@ -80,10 +88,10 @@ def test_ssl(console_reporter): assert "4096: 7688.5" in result -def test_sys(console_reporter): +def test_sys(console_reporter, result_path): """ Test sys_info """ - result = console_reporter.render('ssl') + result = console_reporter.render('ssl', result_path) assert "System Information:" in result assert "Host Name: node-38.zte.com.cn" in result assert "Memory: 4403.7/128524.1MB" in result |