DandelionNStuff/pymilter
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Record new envfrom for TestMilter.chgfrom

Browse Source
This commit is contained in:
Stuart D. Gathman
2016-08-10 17:57:51 -04:00
parent 627a2be49f
commit ded1412294
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Milter/test.py
+4 -2
View File
@@ -64,9 +64,10 @@ class TestBase(object):
def chgfrom(self,sender,params=None): def chgfrom(self,sender,params=None):
if not self._body: if not self._body:
raise IOError,"chgheader not called from eom()" raise IOError,"chgfrom not called from eom()"
self.log('chgfrom: sender=%s' % (sender)) self.log('chgfrom: sender=%s' % (sender))
self._envfromchanged = True self._envfromchanged = True
self._sender = sender
# FIXME: rfc822 indexing does not really reflect the way chg/add header # FIXME: rfc822 indexing does not really reflect the way chg/add header
# work for a %milter # work for a %milter
@@ -131,8 +132,9 @@ class TestBase(object):
self._bodyreplaced = False self._bodyreplaced = False
self._headerschanged = False self._headerschanged = False
self._reply = None self._reply = None
self._sender = '<%s>'%sender
msg = rfc822.Message(fp) msg = rfc822.Message(fp)
rc = self.envfrom('<%s>'%sender) rc = self.envfrom(self._sender)
if rc != Milter.CONTINUE: return rc if rc != Milter.CONTINUE: return rc
for rcpt in (rcpt,) + rcpts: for rcpt in (rcpt,) + rcpts:
rc = self.envrcpt('<%s>'%rcpt) rc = self.envrcpt('<%s>'%rcpt)