diff options
| author |   wu.zhihui <wu.zhihui1@zte.com.cn> | 2016-11-08 20:18:26 +0800 |
|---|---|---|
| committer | wu.zhihui <wu.zhihui1@zte.com.cn> | 2016-11-08 20:25:21 +0800 |
| commit | 03b2fdd33a019c4eabc8da7ba49c851bf91ffc4e (patch) | |
| tree | d3c36e47addd031a4844ad717526665d62ff9730 | |
| parent | aa374b2bac23a89442ef59f3757d40cdf66c3814 (diff) | |
Bugfix: cli.py and its unit test case
since qtip use log instead of print, assert sentence need
to modify.
Change-Id: I8d19d0e50c4c70f34c7e916c7828984163586260
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
| -rw-r--r-- | func/cli.py | 2 | ||||
| -rw-r--r-- | tests/cli_test.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/func/cli.py b/func/cli.py index 17f0bde7..cea55749 100644 --- a/func/cli.py +++ b/func/cli.py @@ -44,7 +44,7 @@ class Cli: args = self._parse_args(args) if not args_handler.check_suite(args.file): - logger.error("ERROR: This suite file doesn't exist under benchmarks/suite/.\ + logger.error("ERROR: This suite file %s doesn't exist under benchmarks/suite/.\ Please enter correct file." % str(args.file)) sys.exit(1) diff --git a/tests/cli_test.py b/tests/cli_test.py index d558329f..255c2a37 100644 --- a/tests/cli_test.py +++ b/tests/cli_test.py @@ -2,6 +2,7 @@ import pytest import mock import os from func.cli import Cli +from os.path import expanduser class TestClass: @@ -9,11 +10,11 @@ class TestClass: (['-l', 'zte', '-f', - 'compute'], "You have specified a lab that is not present in test_plan"), + 'compute'], "You have specified a lab that is not present under test_plan"), (['-l', 'default', '-f', - 'test'], "This suite file doesn't exist under benchmarks/suite/") + 'test'], "This suite file test doesn't exist under benchmarks/suite/") ]) def test_cli_error(self, capfd, test_input, expected): k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel', 'PWD': '/home'}) @@ -21,8 +22,9 @@ class TestClass: k.start() Cli(test_input) k.stop() - resout, reserr = capfd.readouterr() - assert expected in resout + with open(expanduser('~') + "/qtip/logs/cli.log", "r") as file: + data = file.read() + assert expected in data @pytest.mark.parametrize("test_input, expected", [ (['-l', |