[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Sun May 30 09:06:12 MDT 2010


The branch, master has been updated
       via  5986569... selftest: list.remove raises ValueError rather than KeyError.
      from  a1b44f4... s3: set pthread cflags in a more portable fashion

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 598656985aeb1a1ac11d246bb942c2248dfbfd8c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 30 17:05:07 2010 +0200

    selftest: list.remove raises ValueError rather than KeyError.

-----------------------------------------------------------------------

Summary of changes:
 selftest/subunithelper.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index d03a1d0..d2054a9 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -76,7 +76,7 @@ def parse_results(msg_ops, statistics, fh):
             if result in ("success", "successful"):
                 try:
                     open_tests.remove(testname)
-                except KeyError:
+                except ValueError:
                     statistics['TESTS_ERROR']+=1
                     msg_ops.end_test(testname, "error", True, 
                             "Test was never started")
@@ -86,7 +86,7 @@ def parse_results(msg_ops, statistics, fh):
             elif result in ("xfail", "knownfail"):
                 try:
                     open_tests.remove(testname)
-                except KeyError:
+                except ValueError:
                     statistics['TESTS_ERROR']+=1
                     msg_ops.end_test(testname, "error", True, 
                             "Test was never started")
@@ -97,7 +97,7 @@ def parse_results(msg_ops, statistics, fh):
             elif result in ("failure", "fail"):
                 try:
                     open_tests.remove(testname)
-                except KeyError:
+                except ValueError:
                     statistics['TESTS_ERROR']+=1
                     msg_ops.end_test(testname, "error", True, 
                             "Test was never started")
@@ -115,7 +115,7 @@ def parse_results(msg_ops, statistics, fh):
                 statistics['TESTS_ERROR']+=1
                 try:
                     open_tests.remove(testname)
-                except KeyError:
+                except ValueError:
                     pass
                 msg_ops.end_test(testname, "error", True, reason)
             elif result == "skip-testsuite":


-- 
Samba Shared Repository


More information about the samba-cvs mailing list