[CalendarServer-changes] [11227] CalDAVTester/trunk/src/caldavtest.py

[source_changes at macosforge.org]

Revision: 11227
          http://trac.calendarserver.org//changeset/11227
Author:   cdaboo at apple.com
Date:     2013-05-21 10:42:13 -0700 (Tue, 21 May 2013)
Log Message:
-----------
Add a request count into the User-Agent string to make it easier to determine which of multiple requests in
a test failed.

Modified Paths:
--------------
    CalDAVTester/trunk/src/caldavtest.py

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2013-05-21 13:40:40 UTC (rev 11226)
+++ CalDAVTester/trunk/src/caldavtest.py	2013-05-21 17:42:13 UTC (rev 11227)
@@ -205,8 +205,8 @@
             else:
                 reqstats = None
             for ctr in range(test.count): #@UnusedVariable
-                for req in test.requests:
-                    result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest(req, test.details, True, False, reqstats, etags=etags, label=label, count=ctr + 1)
+                for req_count, req in enumerate(test.requests):
+                    result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest(req, test.details, True, False, reqstats, etags=etags, label="%s | #%s" % (label, req_count + 1,), count=ctr + 1)
                     if not result:
                         break
             loglevel = [manager.LOG_ERROR, manager.LOG_HIGH][result]
@@ -225,13 +225,11 @@
             return True
         description += " " * max(1, STATUSTXT_WIDTH - len(description))
         self.manager.log(manager.LOG_HIGH, description, before=1, after=0)
-        ctr = 1
-        for req in list:
-            result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest(req, False, doverify, forceverify, label=label, count=count)
+        for req_count, req in enumerate(list):
+            result, resulttxt, _ignore_response, _ignore_respdata = self.dorequest(req, False, doverify, forceverify, label="%s | #%s" % (label, req_count + 1), count=count)
             if not result:
-                resulttxt += "\nFailure during multiple requests #%d out of %d, request=%s" % (ctr, len(list), str(req))
+                resulttxt += "\nFailure during multiple requests #%d out of %d, request=%s" % (req_count + 1, len(list), str(req))
                 break
-            ctr += 1
         loglevel = [manager.LOG_ERROR, manager.LOG_HIGH][result]
         self.manager.log(loglevel, ["[FAILED]", "[OK]"][result])
         if len(resulttxt) > 0:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130521/fe46093a/attachment.html>