diff --git a/.gitignore b/.gitignore index 3b44bd3..0ddcc0c 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,4 @@ cython_debug/ # option (not recommended) you can uncomment the following to ignore the entire idea folder. .idea/ cancel* +/noconf.yaml diff --git a/src/criteriaSorter/modules/criteriaSorter.py b/src/criteriaSorter/modules/criteriaSorter.py index 003347a..9f29a27 100644 --- a/src/criteriaSorter/modules/criteriaSorter.py +++ b/src/criteriaSorter/modules/criteriaSorter.py @@ -111,19 +111,21 @@ def action_sort(argsp): def action_list(argsp): - logging.info("Listing operations") - with open(argsp.config, 'r') as stream: - try: - config = yaml.load(stream, Loader=yaml.FullLoader) - except yaml.YAMLError as exc: - logging.error(exc) - sys.exit(1) - if argsp.verbose: - rich.print(config["operations"]) - else: - for line in config["operations"].keys(): - rich.print(line) - + try: + logging.info("Listing operations") + with open(argsp.config, 'r') as stream: + config = yaml.safe_load(stream) + if argsp.verbose: + rich.print(config["operations"]) + else: + for line in config["operations"].keys(): + rich.print(line) + except TypeError: + logging.critical("No operations found in config file {}".format(argsp.config)) + sys.exit(1) + except FileNotFoundError: + logging.critical("Config {} file not found".format(argsp.config)) + sys.exit(1) # def action_help(argsp): # if argsp: diff --git a/tests/modules/test_criteriaSorter.py b/tests/modules/test_criteriaSorter.py index a32b71f..4621125 100644 --- a/tests/modules/test_criteriaSorter.py +++ b/tests/modules/test_criteriaSorter.py @@ -124,13 +124,17 @@ def test_action_list(verbose, capsys): assert "condition" in capsys.readouterr().out -# @pytest.mark.parametrize("args", [["--config=noconf.yaml","list"]]) -# def test_action_list_error(args, caplog, monkeypatch): -# -# with open("noconf.yaml", "w") as f: -# f.write("Bad config =:/\n+3") -# -# args = criteriaSorter.parse_args(args) -# with pytest.raises(SystemExit): -# with caplog.at_level(logging.ERROR): -# criteriaSorter.action_list(args) +@pytest.mark.parametrize("args, error", [ + [["--config=noconf.yaml", "list"], "No operations found"], + [["--config=unexisting_conf", "list"], "Config unexisting_conf file not found"], +]) +def test_action_list_error(args, error, caplog, monkeypatch): + + with open("noconf.yaml", "w") as f: + f.write("Bad config =:/\n+3") + + args = criteriaSorter.parse_args(args) + with pytest.raises(SystemExit): + with caplog.at_level(logging.ERROR): + criteriaSorter.action_list(args) + assert error in caplog.text