Skip to content

Commit 9ece5c5

Browse files
committed
fix: put an example mailconfig in the test data dir
1 parent 4a4d889 commit 9ece5c5

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

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: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,13 @@
3131
import mock
3232
import logging
3333
import sys
34-
from mock.mock import MagicMock
35-
36-
if sys.version_info[0] >= 3:
37-
from unittest.mock import mock_open
38-
elif sys.version_info[0] >= 2:
39-
from mock import mock_open
4034

4135
from vsc.install.testing import TestCase
4236

4337
from email.mime.text import MIMEText
4438
from vsc.utils.mail import VscMail
4539

46-
class TestVscMailConfig(TestCase):
40+
class TestVscMail(TestCase):
4741

4842

4943
def test_config_file(self):
@@ -64,21 +58,7 @@ def test_config_file(self):
6458
self.assertEqual(mail.mail_host, mail_host)
6559
self.assertEqual(mail.mail_port, mail_port)
6660

67-
cfgfile = """
68-
[main]
69-
mail_host = config_host
70-
mail_port = 789
71-
smtp_auth_user = config_user
72-
smtp_auth_password = config_passwd
73-
smtp_use_starttls = 1
74-
"""
75-
# based on https://stackoverflow.com/questions/1289894/how-do-i-mock-an-open-used-in-a-with-statement-using-the-mock-framework-in-pyth/34677735#34677735
76-
if sys.version_info[0] >= 3:
77-
with mock.patch("builtins.open", mock_open(read_data=cfgfile)):
78-
mail = VscMail(mail_config="blah")
79-
elif sys.version_info[0] >= 2:
80-
with mock.patch("__builtin__.open", mock_open(read_data=cfgfile)):
81-
mail = VscMail(mail_config="blah")
61+
mail = VscMail(mail_config=os.path.dirname(__file__) + '/data/' + 'mailconfig.ini')
8262

8363
logging.warning("mail.mail_host: %s", mail.mail_host)
8464

@@ -88,8 +68,6 @@ def test_config_file(self):
8868
self.assertEqual(mail.smtp_auth_password, "config_passwd")
8969
self.assertEqual(mail.smtp_use_starttls, '1')
9070

91-
92-
class TestVscMail(TestCase):
9371
@mock.patch('vsc.utils.mail.smtplib')
9472
@mock.patch('vsc.utils.mail.ssl')
9573
def test_send(self, mock_ssl, mock_smtplib):

0 commit comments

Comments
 (0)