Skip to content

Commit 31da2c0

Browse files
committed
test: test for the mail config file
1 parent b2b92d1 commit 31da2c0

File tree

3 files changed

+38
-2
lines changed

3 files changed

+38
-2
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import vsc.install.shared_setup as shared_setup
3737
from vsc.install.shared_setup import ag, kh, jt, sdw
3838

39-
VSC_INSTALL_REQ_VERSION = '0.15.2'
39+
VSC_INSTALL_REQ_VERSION = '0.17.19'
4040

4141
_coloredlogs_pkgs = [
4242
'coloredlogs < 6.0', # automatic log colorizer

test/data/mailconfig.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[main]
2+
mail_host = config_host
3+
mail_port = 789
4+
smtp_auth_user = config_user
5+
smtp_auth_password = config_passwd
6+
smtp_use_starttls = 1

test/mail.py

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
@author: Andy Georges (Ghent University)
3030
"""
3131
import mock
32+
import logging
3233
import os
3334

3435
from vsc.install.testing import TestCase
@@ -38,6 +39,35 @@
3839

3940
class TestVscMail(TestCase):
4041

42+
43+
def test_config_file(self):
44+
45+
mail_host = "mailhost.domain"
46+
mail_port = 123
47+
mail_host_port = "mailhost.domain:567"
48+
smtp_auth_user = "user"
49+
smtp_auth_password = "passwd"
50+
smtp_use_starttls = True
51+
52+
mail = VscMail(mail_host=mail_host)
53+
54+
self.assertEqual(mail.mail_host, mail_host)
55+
self.assertEqual(mail.mail_port, 587)
56+
57+
mail = VscMail(mail_host=mail_host, mail_port=mail_port)
58+
self.assertEqual(mail.mail_host, mail_host)
59+
self.assertEqual(mail.mail_port, mail_port)
60+
61+
mail = VscMail(mail_config=os.path.dirname(__file__) + '/data/' + 'mailconfig.ini')
62+
63+
logging.warning("mail.mail_host: %s", mail.mail_host)
64+
65+
self.assertEqual(mail.mail_host, "config_host")
66+
self.assertEqual(mail.mail_port, 789)
67+
self.assertEqual(mail.smtp_auth_user, "config_user")
68+
self.assertEqual(mail.smtp_auth_password, "config_passwd")
69+
self.assertEqual(mail.smtp_use_starttls, '1')
70+
4171
@mock.patch('vsc.utils.mail.smtplib')
4272
@mock.patch('vsc.utils.mail.ssl')
4373
def test_send(self, mock_ssl, mock_smtplib):
@@ -51,7 +81,7 @@ def test_send(self, mock_ssl, mock_smtplib):
5181
vm = VscMail()
5282

5383
self.assertEqual(vm.mail_host, '')
54-
self.assertEqual(vm.mail_port, 0)
84+
self.assertEqual(vm.mail_port, 587)
5585
self.assertEqual(vm.smtp_auth_user, None)
5686
self.assertEqual(vm.smtp_auth_password, None)
5787
self.assertEqual(vm.smtp_use_starttls, False)

0 commit comments

Comments
 (0)