jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add configurable timeout option to notify/smtp (#6609)

Browse Source 
* Add configurable timeout option to notify/smtp

* Updated smtp test to include timeout param

* fixed 80 column style issue
This commit is contained in:
hawk259 2017-03-14 14:00:16 -04:00 committed by Fabian Affolter
parent 5529d77c62
commit f4d8095e54
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/notify/smtp.py
View File

@ -18,7 +18,8 @@ from homeassistant.components.notify import (
ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_DATA, PLATFORM_SCHEMA, ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_DATA, PLATFORM_SCHEMA,
BaseNotificationService) BaseNotificationService)
from homeassistant.const import ( from homeassistant.const import (
CONF_USERNAME, CONF_PASSWORD, CONF_PORT, CONF_SENDER, CONF_RECIPIENT) CONF_USERNAME, CONF_PASSWORD, CONF_PORT, CONF_TIMEOUT,
CONF_SENDER, CONF_RECIPIENT)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
@ -32,6 +33,7 @@ CONF_SERVER = 'server'
DEFAULT_HOST = 'localhost' DEFAULT_HOST = 'localhost'
DEFAULT_PORT = 25 DEFAULT_PORT = 25
DEFAULT_TIMEOUT = 5
DEFAULT_DEBUG = False DEFAULT_DEBUG = False
DEFAULT_STARTTLS = False DEFAULT_STARTTLS = False
@ -40,6 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_RECIPIENT): vol.Email(), vol.Required(CONF_RECIPIENT): vol.Email(),
vol.Optional(CONF_SERVER, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_SERVER, default=DEFAULT_HOST): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
vol.Optional(CONF_SENDER): vol.Email(), vol.Optional(CONF_SENDER): vol.Email(),
vol.Optional(CONF_STARTTLS, default=DEFAULT_STARTTLS): cv.boolean, vol.Optional(CONF_STARTTLS, default=DEFAULT_STARTTLS): cv.boolean,
vol.Optional(CONF_USERNAME): cv.string, vol.Optional(CONF_USERNAME): cv.string,
@ -53,6 +56,7 @@ def get_service(hass, config, discovery_info=None):
mail_service = MailNotificationService( mail_service = MailNotificationService(
config.get(CONF_SERVER), config.get(CONF_SERVER),
config.get(CONF_PORT), config.get(CONF_PORT),
config.get(CONF_TIMEOUT),
config.get(CONF_SENDER), config.get(CONF_SENDER),
config.get(CONF_STARTTLS), config.get(CONF_STARTTLS),
config.get(CONF_USERNAME), config.get(CONF_USERNAME),
@ -69,11 +73,12 @@ def get_service(hass, config, discovery_info=None):
class MailNotificationService(BaseNotificationService): class MailNotificationService(BaseNotificationService):
"""Implement the notification service for E-Mail messages.""" """Implement the notification service for E-Mail messages."""
def __init__(self, server, port, sender, starttls, username, def __init__(self, server, port, timeout, sender, starttls, username,
password, recipient, debug): password, recipient, debug):
"""Initialize the service.""" """Initialize the service."""
self._server = server self._server = server
self._port = port self._port = port
self._timeout = timeout
self._sender = sender self._sender = sender
self.starttls = starttls self.starttls = starttls
self.username = username self.username = username
@ -84,7 +89,7 @@ class MailNotificationService(BaseNotificationService):
def connect(self): def connect(self):
"""Connect/authenticate to SMTP Server.""" """Connect/authenticate to SMTP Server."""
mail = smtplib.SMTP(self._server, self._port, timeout=5) mail = smtplib.SMTP(self._server, self._port, timeout=self._timeout)
mail.set_debuglevel(self.debug) mail.set_debuglevel(self.debug)
mail.ehlo_or_helo_if_needed() mail.ehlo_or_helo_if_needed()
if self.starttls: if self.starttls:

4
tests/components/notify/test_smtp.py
View File

@ -21,8 +21,8 @@ class TestNotifySmtp(unittest.TestCase):
def setUp(self): # pylint: disable=invalid-name def setUp(self): # pylint: disable=invalid-name
"""Setup things to be run when tests are started.""" """Setup things to be run when tests are started."""
self.hass = get_test_home_assistant() self.hass = get_test_home_assistant()
self.mailer = MockSMTP('localhost', 25, 'test@test.com', 1, 'testuser', self.mailer = MockSMTP('localhost', 25, 5, 'test@test.com', 1,
'testpass', 'testrecip@test.com', 0) 'testuser', 'testpass', 'testrecip@test.com', 0)
def tearDown(self): # pylint: disable=invalid-name def tearDown(self): # pylint: disable=invalid-name
""""Stop down everything that was started.""" """"Stop down everything that was started."""