diff options
| -rw-r--r-- | qtip/reporter/filters.py | 2 | ||||
| -rw-r--r-- | qtip/reporter/templates/base.j2 | 6 | ||||
| -rw-r--r-- | tests/unit/cli/cmd_report_test.py | 66 | ||||
| -rw-r--r-- | tests/unit/reporter/console_test.py | 66 |
4 files changed, 26 insertions, 114 deletions
diff --git a/qtip/reporter/filters.py b/qtip/reporter/filters.py index dc46e195..c0c379df 100644 --- a/qtip/reporter/filters.py +++ b/qtip/reporter/filters.py @@ -8,7 +8,7 @@ ############################################################################## -def justify(pair, width=100, padding_with='.'): +def justify(pair, width=80, padding_with='.'): """align first element along the left margin, second along the right, padding spaces""" n = width - len(pair[0]) return '{key}{value:{c}>{n}}'.format(key=pair[0], value=pair[1], c=padding_with, n=n) diff --git a/qtip/reporter/templates/base.j2 b/qtip/reporter/templates/base.j2 index 34242b40..5dafc8b1 100644 --- a/qtip/reporter/templates/base.j2 +++ b/qtip/reporter/templates/base.j2 @@ -1,4 +1,4 @@ -{{ '=' * 100}} +{{ ('=', '=')|justify }} {{ ('Plan Name', plan_name)|justify }} {{ ('Start Time', start_time)|justify }} {{ ('Stop Time', stop_time)|justify }} @@ -14,7 +14,7 @@ {% include '%s.j2' % metric_name %} {% endif %} System Information -{{ ('CPU Brand', bm.sysinfo.cpu)|justify }} +{{ ('CPU', bm.sysinfo.cpu)|justify }} {{ ('Disk', bm.sysinfo.disk)|justify }} {{ ('Host Name', bm.sysinfo.hostname)|justify }} {{ ('Kernel', bm.sysinfo.kernel)|justify }} @@ -25,5 +25,5 @@ System Information {%- endfor -%} {% endfor %} -{{ '\033[93m' }} {{ '*' * 100}} {{ '\033[0m' }} +{{ ('\033[93m*', '*\033[0m')|justify }} {%- endfor -%} diff --git a/tests/unit/cli/cmd_report_test.py b/tests/unit/cli/cmd_report_test.py index 21e757d8..064ed8fd 100644 --- a/tests/unit/cli/cmd_report_test.py +++ b/tests/unit/cli/cmd_report_test.py @@ -26,60 +26,16 @@ def result_path(): return result -def test_dhrystone(runner, result_path): +@pytest.mark.parametrize(['report_name'], [ + ('dhrystone',), + ('whetstone',), + ('dpi',), + ('ramspeed',), + ('ssl',) +]) +def test_dhrystone(report_name, runner, result_path): """Test dhrystone report""" - result = runner.invoke(cli, ['report', 'show', 'dhrystone', '-p', result_path]) - assert "Benchmark..............................................................." \ - "...................dhrystone" in result.output - assert "Score..................................................................." \ - "..................63529.6" - - -def test_whetstone(runner, result_path): - """ Test whetstone output""" - - result = runner.invoke(cli, ['report', 'show', 'whetstone', '-p', result_path]) - assert "Number................................................................." \ - "...........................40" in result.output - assert "Total CPUs............................................................." \ - "...........................40" - - -def test_dpi(runner, result_path): - """ Test dpi report""" - result = runner.invoke(cli, ['report', 'show', 'dpi', '-p', result_path]) - assert "Bits per Second..................................................." \ - ".............................3.638" in result.output - assert "Packets per Second................................................" \ - ".............................1.458" in result.output - - -def test_ramspeed(runner, result_path): - """ Test ramspeed report """ - result = runner.invoke(cli, ['report', 'show', 'ramspeed', '-p', result_path]) - assert "Float Addition........................................................" \ - "......................10522.33" in result.output - assert "Integer Average........................................................" \ - ".....................11466.52" in result.output - - -def test_ssl(runner, result_path): - """ Test ssl report""" - - result = runner.invoke(cli, ['report', 'show', 'ssl', '-p', result_path]) - assert "8192............................................................." \ - ".........................667303.94k" in result.output - assert "1024.............................................................." \ - "..........................100088.3" in result.output - - -def test_sys(runner, result_path): - """ Test sys_info """ - - 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 "Operating System.................................................." \ - "...............Ubuntu 16.04 xenial" in result.output + result = runner.invoke(cli, ['report', 'show', report_name, '-p', result_path]) + for line in str(result).split('\n'): + assert len(line) <= 80 diff --git a/tests/unit/reporter/console_test.py b/tests/unit/reporter/console_test.py index 7ece4663..11fb3f71 100644 --- a/tests/unit/reporter/console_test.py +++ b/tests/unit/reporter/console_test.py @@ -29,60 +29,16 @@ def test_constructor(console_reporter): assert isinstance(console_reporter, ConsoleReporter) -def test_dhrystone(console_reporter, result_path): +@pytest.mark.parametrize(['template_name'], [ + ('dhrystone',), + ('whetstone',), + ('dpi',), + ('ramspeed',), + ('ssl',) +]) +def test_templates(template_name, console_reporter, result_path): """ Test dhrystone report""" - result = console_reporter.render('dhrystone', result_path) - assert "Benchmark..............................................................." \ - "...................dhrystone" in result - - -def test_whetstone(console_reporter, result_path): - """ Test whetstone output""" - - result = console_reporter.render('whetstone', result_path) - assert "Number................................................................." \ - "...........................40" in result - assert "Total CPUs............................................................." \ - "...........................40" in result - - -def test_dpi(console_reporter, result_path): - """ Test dpi report""" - - result = console_reporter.render('dpi', result_path) - assert "Bits per Second..................................................." \ - ".............................3.638" in result - assert "Packets per Second................................................" \ - ".............................1.458" in result - - -def test_ramspeed(console_reporter, result_path): - """ Test ramspeed report """ - - result = console_reporter.render('ramspeed', result_path) - assert "Float Addition........................................................" \ - "......................10522.33" in result - assert "Integer Average........................................................" \ - ".....................11466.52" in result - - -def test_ssl(console_reporter, result_path): - """ Test ssl report""" - - result = console_reporter.render('ssl', result_path) - assert "8192............................................................." \ - ".........................667303.94k" in result - assert "1024.............................................................." \ - "..........................100088.3" in result - - -def test_sys(console_reporter, result_path): - """ Test sys_info """ - - result = console_reporter.render('ssl', result_path) - assert "System Information" in result - assert "Host Name........................................................" \ - ".................node-38.zte.com.cn" in result - assert "Operating System.................................................." \ - "...............Ubuntu 16.04 xenial" in result + result = console_reporter.render(template_name, result_path) + for line in result.split('\n'): + assert len(line) <= 80 |