diff options
-rw-r--r-- | evolution/composerprefs.py | 14 | ||||
-rw-r--r-- | evolution/mailtests.py | 18 |
2 files changed, 17 insertions, 15 deletions
diff --git a/evolution/composerprefs.py b/evolution/composerprefs.py index d827f4c..691b91e 100644 --- a/evolution/composerprefs.py +++ b/evolution/composerprefs.py @@ -30,7 +30,7 @@ from contact import * from evoutils.mail import * def addnewsignature(name,text): - log ('Add New Signature','teststart') + #log ('Add New Signature','teststart') try: #selectMailPane() try: @@ -45,7 +45,7 @@ def addnewsignature(name,text): #undoremap ('evolution',window_id) time.sleep (1) #remap ('evolution',window_id) - click (window_id,'btnAdd1') + click (window_id,'btnAdd2') waittillguiexist ('frmEditsignature') time.sleep (1) except: @@ -62,17 +62,19 @@ def addnewsignature(name,text): flag=1 break if flag==1: - log ('Signature added successfully','info') + #log ('Signature added successfully','info') + return 1 else: - log ('Signature not added succcessfully','cause') + #log ('Signature not added succcessfully','cause') + return 0 raise LdtpExecutionError (0) # except: #undoremap ('evolution',window_id) except: log ('Add New Signature failed','error') - log ('Add New Signature','testend') + #log ('Add New Signature','testend') raise LdtpExecutionError (0) - log ('Add New Signature','testend') + #log ('Add New Signature','testend') def fillinsignaturevalues (name,text): diff --git a/evolution/mailtests.py b/evolution/mailtests.py index e3e6244..3786e30 100644 --- a/evolution/mailtests.py +++ b/evolution/mailtests.py @@ -267,15 +267,15 @@ def add_to_replytofield(replyto,to): sent_mail_count=getrowcount (window_id,'ttblMessages') selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage') waittillguiexist ('frmComposeMessage') - populate_mail_header ([to],subject,body) + populate_mail_header (to,subject,body) check ('frmComposeMessage','mnuReply-ToField') settextvalue ('frmComposeMessage','txtReply-To',replyto) sendmail (subject) - click ('frmEvolution-Mail', 'btnSend/Receive') - waittillguinotexist ('dlgSend&ReceiveMail') + click ('frmEvolution-*', 'btnSend/Receive') + waittillguinotexist ('dlgSend*') time.sleep (5) #click ('frmComposeMessage','btnSend') - releasecontext () + #releasecontext () #undoremap ('evolution',window_id) #remap ('evolution',window_id) new_sent_mail_count=getrowcount (window_id,'ttblMessages') @@ -283,13 +283,13 @@ def add_to_replytofield(replyto,to): log ('Message not sent','cause') raise LdtpExecutionError (0) selectrowindex(window_id,'ttblMessages',sent_mail_count) - selectmenuitem (window_id,'mnuMessage;mnuReply') - setcontext ('Compose a message','Re: '+subject[0]) - waittillguiexist ('frmComposeMessage') - if gettextvalue ('frmComposeMessage','txtTo') != replyto: + selectmenuitem (window_id,'mnuMessage;mnuPostaReply') + #setcontext ('Compose Message','Re: '+subject[0]) + waittillguiexist ('frmRe*') + if gettextvalue ('frmRe*','txtTo') != replyto: log ('To field does not have replyto address','cause') raise LdtpExecutionError (0) - selectmenuitem ('frmComposeMessage','mnuFile;mnuClose') + selectmenuitem ('frmRe*','mnuFile;mnuClose') log ('Reply to Field','pass') #undoremap ('evolution',window_id) except: |