# HG changeset patch # User Sandro Knauß # Date 1330389905 -3600 # Node ID 1bcca1a40769f2eadc33821fc0b1b9c8c8cef86e # Parent 85ede27b1add28d0e6276c22a076b6ed035e96ae test for nor explicit frm mailaddress diff -r 85ede27b1add -r 1bcca1a40769 iro/controller/viewinterface.py --- a/iro/controller/viewinterface.py Tue Feb 28 01:44:11 2012 +0100 +++ b/iro/controller/viewinterface.py Tue Feb 28 01:45:05 2012 +0100 @@ -100,8 +100,8 @@ d.addCallback(ret) return d - @validate(kwd="recipients",func=vEmail) - @validate(kwd="frm",func=vEmail) + @validate(kwd="recipients",func=vEmail, allowString=False) + @validate(kwd="frm",func=vEmail, need=False, allowList=False) @vUser @vRoute(typ="mail") def mail(self, user, subject, body, recipients, frm=None, route="default", info=""): diff -r 85ede27b1add -r 1bcca1a40769 tests/viewinterface.py --- a/tests/viewinterface.py Tue Feb 28 01:44:11 2012 +0100 +++ b/tests/viewinterface.py Tue Feb 28 01:45:05 2012 +0100 @@ -232,6 +232,25 @@ self.assertEqual(taskPool.pool.q.qsize(),1) @inlineCallbacks + def testMailFrmNone(self): + with self.session() as session: + u = User(name='test',apikey='abcdef123456789') + o = Offer(name='loc',provider="localhost",route="",typ="mail") + u.rights.append(Userright(o)) + session.add(u) + + jobid = yield Interface().mail('abcdef123456789','sub', "hey body!", ['t@te.de'], None,['loc']) + with self.session() as session: + u = session.merge(u) + job = u.job(jobid) + exJob = job.extend + + self.assertEqual(exJob.message,Mail("sub",'hey body!',None)) + self.assertEqual(taskPool.pool.q.qsize(),1) + + + + @inlineCallbacks def testFax(self): with self.session() as session: u = User(name='test',apikey='abcdef123456789')