[Spambayes-checkins] spambayes/Outlook2000 tester.py,1.21,1.22

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv9138

Modified Files:
	tester.py 
Log Message:
Ask if you want the slow, non-filter tests run.
Add E_OBJECT_CHANGED tests, as per [ 803798 ] MAPI_E_OBJECT_CHANGED error 
saving spam score


Index: tester.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/tester.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tester.py	16 Dec 2003 05:06:33 -0000	1.21
--- tester.py	19 Dec 2003 06:28:55 -0000	1.22
***************
*** 556,560 ****
      msgstore.test_suite_failure_request = None
  
! def _setup_for_mapi_failure(checkpoint, hr):
      assert msgstore.test_suite_running, "msgstore should already know its running"
      assert not msgstore.test_suite_failure, "should already have torn down previous failure"
--- 556,560 ----
      msgstore.test_suite_failure_request = None
  
! def _setup_for_mapi_failure(checkpoint, hr, fail_count = None):
      assert msgstore.test_suite_running, "msgstore should already know its running"
      assert not msgstore.test_suite_failure, "should already have torn down previous failure"
***************
*** 562,576 ****
                           (hr, "testsuite generated error", None, -1)
      msgstore.test_suite_failure_request = checkpoint
  
  def _setup_mapi_notfound_failure(checkpoint):
      _setup_for_mapi_failure(checkpoint, mapi.MAPI_E_NOT_FOUND)
  
! def _do_single_failure_ham_test(driver, checkpoint, hr):
!     _do_single_failure_test(driver, True, checkpoint, hr)
  
! def _do_single_failure_spam_test(driver, checkpoint, hr):
!     _do_single_failure_test(driver, False, checkpoint, hr)
  
! def _do_single_failure_test(driver, is_ham, checkpoint, hr):
      print "-> Testing MAPI error '%s' in %s" % (mapiutil.GetScodeString(hr),
                                                checkpoint)
--- 562,577 ----
                           (hr, "testsuite generated error", None, -1)
      msgstore.test_suite_failure_request = checkpoint
+     msgstore.test_suite_failure_count = fail_count
  
  def _setup_mapi_notfound_failure(checkpoint):
      _setup_for_mapi_failure(checkpoint, mapi.MAPI_E_NOT_FOUND)
  
! def _do_single_failure_ham_test(driver, checkpoint, hr, fail_count = None):
!     _do_single_failure_test(driver, True, checkpoint, hr, fail_count)
  
! def _do_single_failure_spam_test(driver, checkpoint, hr, fail_count = None):
!     _do_single_failure_test(driver, False, checkpoint, hr, fail_count)
  
! def _do_single_failure_test(driver, is_ham, checkpoint, hr, fail_count):
      print "-> Testing MAPI error '%s' in %s" % (mapiutil.GetScodeString(hr),
                                                checkpoint)
***************
*** 583,587 ****
              msg, words = driver.CreateTestMessageInFolder(SPAM, folder)
          try:
!             _setup_for_mapi_failure(checkpoint, hr)
              try:
                  # sleep to ensure filtering.
--- 584,588 ----
              msg, words = driver.CreateTestMessageInFolder(SPAM, folder)
          try:
!             _setup_for_mapi_failure(checkpoint, hr, fail_count)
              try:
                  # sleep to ensure filtering.
***************
*** 610,613 ****
--- 611,616 ----
          _do_single_failure_ham_test(driver, "MAPIMsgStoreMsg.SetField", -2146644781)
          _do_single_failure_ham_test(driver, "MAPIMsgStoreMsg.Save", -2146644781)
+         _do_single_failure_ham_test(driver, "MAPIMsgStoreMsg.Save",
+                                     mapi.MAPI_E_OBJECT_CHANGED, fail_count=1)
          # SetReadState???
          _do_single_failure_spam_test(driver, "MAPIMsgStoreMsg._DoCopyMove", mapi.MAPI_E_TABLE_TOO_BIG)
***************
*** 651,656 ****
          run_failure_tests(manager)
          run_invalid_id_tests(manager)
!         # non-filter tests take alot of time - do them last.
!         run_nonfilter_tests(manager)
          print "*" * 20
          print "Test suite finished without error!"
--- 654,661 ----
          run_failure_tests(manager)
          run_invalid_id_tests(manager)
!         # non-filter tests take alot of time - ask if you want to do them
!         if manager.AskQuestion("Do you want to run the non-filter tests?" \
!                                "\r\n\r\nThese may take some time"):
!             run_nonfilter_tests(manager)
          print "*" * 20
          print "Test suite finished without error!"