Skip to content

Commit 4becc5c

Browse files
author
Juliya Smith
committed
Better error handling:
1 parent 12c2b09 commit 4becc5c

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

c42seceventcli/aed/main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import json
2+
from socket import gaierror, herror, timeout
23
from urllib3 import disable_warnings
34
from urllib3.exceptions import InsecureRequestWarning
45
from datetime import datetime, timedelta
@@ -86,7 +87,7 @@ def _get_logger(
8687
destination_port=destination_port,
8788
destination_protocol=destination_protocol,
8889
)
89-
except OSError as ex:
90+
except (herror, gaierror, timeout) as ex:
9091
print(repr(ex))
9192
print(
9293
"Hostname={0}, port={1}, protocol={2}.".format(

tests/aed/test_main.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import pytest
22
from datetime import datetime, timedelta
3+
from socket import herror, gaierror, timeout
34

45
from py42 import settings
56
import py42.debug_level as debug_level
@@ -239,8 +240,20 @@ def test_main_when_get_logger_raises_io_error_causes_exit(patches):
239240
main.main()
240241

241242

242-
def test_main_when_get_logger_raises_os_error_causes_exit(patches):
243-
patches.get_logger.side_effect = OSError
243+
def test_main_when_get_logger_raises_h_error_causes_exit(patches):
244+
patches.get_logger.side_effect = gaierror
245+
with pytest.raises(SystemExit):
246+
main.main()
247+
248+
249+
def test_main_when_get_logger_raises_gai_error_causes_exit(patches):
250+
patches.get_logger.side_effect = herror
251+
with pytest.raises(SystemExit):
252+
main.main()
253+
254+
255+
def test_main_when_get_logger_raises_timeout_causes_exit(patches):
256+
patches.get_logger.side_effect = timeout
244257
with pytest.raises(SystemExit):
245258
main.main()
246259

0 commit comments

Comments
 (0)