Catch all socket errors

Author: Juliya Smith

c42seceventcli/aed/main.py

@@ -1,5 +1,5 @@
 import json
-from socket import gaierror
+from socket import error as socket_error
 from urllib3 import disable_warnings
 from urllib3.exceptions import InsecureRequestWarning
 from datetime import datetime, timedelta
@@ -89,17 +89,17 @@ def _get_logger(
             destination_port=destination_port,
             destination_protocol=destination_protocol,
         )
-    except gaierror:
-        args.cli_parser.print_usage()
+    except socket_error as ex:
+        print(repr(ex))
         print(
-            "Error with provided server destination arguments: hostname={0}, port={1}, protocol={2}.".format(
+            "Hostname={0}, port={1}, protocol={2}.".format(
                 destination, destination_port, destination_protocol
             )
         )
         exit(1)
-    except IOError:
-        args.cli_parser.print_usage()
-        print("Error with provided file path {0}. Try --dest path/to/file.".format(destination))
+    except IOError as ex:
+        print(repr(ex))
+        print("File path: {0}.".format(destination))
         exit(1)
 
 

tests/aed/test_args.py

@@ -84,14 +84,18 @@ def test_get_args_calls_sec_args_try_set_with_expected_args(
     mock_setter.assert_called_once_with(key, expected_cli_val, expected_config_val)
 
 
-def test_get_args_when_destination_is_not_none_and_destination_type_is_stdout_raises_value_error(patches):
+def test_get_args_when_destination_is_not_none_and_destination_type_is_stdout_raises_value_error(
+    patches
+):
     patches.cli_args.destination_type = "stdout"
     patches.cli_args.destination = "Delaware"
     with pytest.raises(ValueError):
         get_args()
 
 
-def test_get_args_when_destination_is_none_and_destination_type_is_server_raises_value_error(patches):
+def test_get_args_when_destination_is_none_and_destination_type_is_server_raises_value_error(
+    patches
+):
     patches.cli_args.destination_type = "server"
     patches.cli_args.destination = None
     with pytest.raises(ValueError):