Merge pull request #123 from gregoil/fix_output_fallback

Change cli output option fallback

requirements.txt

@@ -39,7 +39,7 @@ psutil==5.4.8
 ptyprocess==0.6.0
 py==1.7.0
 pycodestyle==2.4.0
-pyfakefs==3.5.3
+pyfakefs==3.5.4
 pyflakes==2.0.0
 Pygments==2.3.1
 pylint==1.9.3

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = "5.4.0"
+__version__ = "5.4.1"
 
 result_handlers = [
     "db = rotest.core.result.handlers.db_handler:DBHandler",

src/rotest/cli/client.py

@@ -81,10 +81,10 @@ def parse_outputs_option(outputs):
     non_existing_handlers = set(requested_handlers) - set(available_handlers)
 
     if non_existing_handlers:
-        raise ValueError("The following output handlers are not "
-                         "existing: {}.\nAvailable options: {}.".format(
-                              ", ".join(non_existing_handlers),
-                              ", ".join(available_handlers)))
+        raise argparse.ArgumentTypeError(
+            "Illegal output handlers: {}.\n"
+            "Available options: {}.".format(", ".join(non_existing_handlers),
+                                            ", ".join(available_handlers)))
 
     return requested_handlers
 

tests/cli/test_client.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import sys
+import argparse
 
 import mock
 import pytest
@@ -24,10 +25,10 @@ def test_parsing_output_handlers():
 
 
 def test_bad_option_in_output_parser():
-    with pytest.raises(ValueError,
-                       match="The following output handlers are not existing: "
-                             "asd.\nAvailable options:.*pretty"):
-        parse_outputs_option("pretty,asd")
+    with pytest.raises(argparse.ArgumentTypeError,
+                       match="Illegal output handlers: asd.\n"
+                             "Available options:.*tree"):
+        parse_outputs_option("tree,asd")
 
 
 @mock.patch("rotest.cli.client.run_tests")