[PATCH] s3: Fix broken make tests on some build servers

Matthieu Patou mat at matws.net
Wed Oct 13 15:37:06 MDT 2010


This fix is a temporary workaround on a brokage that has been introduced
during the migration to python based subunit.

A definitive and more complete fix exists in the the master branch.
---
 selftest/subunithelper.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index 5121317..8ffb6ad 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -45,7 +45,10 @@ def parse_results(msg_ops, statistics, fh):
             msg_ops.control_msg(l)
             grp = re.match(
                 "(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n", arg)
-            msg_ops.report_time(time.mktime((int(grp.group(1)), int(grp.group(2)), int(grp.group(3)), int(grp.group(4)), int(grp.group(5)), int(grp.group(6)), 0, 0, 0)))
+            try:
+                msg_ops.report_time(time.mktime((int(grp.group(1)), int(grp.group(2)), int(grp.group(3)), int(grp.group(4)), int(grp.group(5)), int(grp.group(6)), 0, 0, 0)))
+            except:
+                print "Not well formated %s" % arg
         elif command in VALID_RESULTS:
             msg_ops.control_msg(l)
             result = command
-- 
1.7.1


--------------010808040204020404090101--


More information about the samba-technical mailing list