<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12705] CalDAVTester/trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12705">12705</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 12:24:02 -0800 (Fri, 14 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add stop on fail option. Define a substitution variable for the current request loop count.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkREADMEtxt">CalDAVTester/trunk/README.txt</a></li>
<li><a href="#CalDAVTestertrunksrcmanagerpy">CalDAVTester/trunk/src/manager.py</a></li>
<li><a href="#CalDAVTestertrunksrcrequestpy">CalDAVTester/trunk/src/request.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkREADMEtxt"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/README.txt (12704 => 12705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/README.txt        2014-02-14 20:22:20 UTC (rev 12704)
+++ CalDAVTester/trunk/README.txt        2014-02-14 20:24:02 UTC (rev 12705)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx">         [--all] \
</span><span class="cx">         [--random] \
</span><span class="cx">         [--random-seed SEED] \
</span><ins>+        [--stop] \
</ins><span class="cx">         [--print-details-onfail] \
</span><span class="cx">         [--always-print-request] \
</span><span class="cx">         [--always-print-response] \
</span><span class="lines">@@ -47,8 +48,10 @@
</span><span class="cx"> 
</span><span class="cx">         --random : randomize the order in which the tests are run.
</span><span class="cx">         
</span><del>-        --random-seed SEED : a specific randon seed to use.
</del><ins>+        --random-seed SEED : a specific random seed to use.
</ins><span class="cx">         
</span><ins>+        --stop : stop running all tests after one test file fails.
+
</ins><span class="cx">         --print-details-onfail : print HTTP request/response when a test fails.
</span><span class="cx">         
</span><span class="cx">         --always-print-request : always print HTTP request.
</span><span class="lines">@@ -60,9 +63,12 @@
</span><span class="cx">         --observer OBSEREVER : specify one or more times to change which classes are
</span><span class="cx">         used to process log and trace messages during a test. The OBSERVER name must
</span><span class="cx">         be the name of a module in the observers package. The default observer is the
</span><del>-        &quot;log&quot; observer which produces an output similar to Python unit tests. The
-        &quot;trace&quot; observer produces an output similar to the original output format.
-        The &quot;jsondump&quot; observer prints a JSON representation of the test results.
</del><ins>+        &quot;log&quot; observer. Available observers are:
+                
+                &quot;log&quot; - produces an output similar to Python unit tests.
+                &quot;trace&quot; - produces an output similar to the original output format.
+                &quot;loadfiles&quot; - prints each test file as it is loaded.
+                &quot;jsondump&quot; - prints a JSON representation of the test results.
</ins><span class="cx">  
</span><span class="cx">         file1 file2 ...: a list of test files to execute tests from.
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalDAVTestertrunksrcmanagerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/manager.py (12704 => 12705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/manager.py        2014-02-14 20:22:20 UTC (rev 12704)
+++ CalDAVTester/trunk/src/manager.py        2014-02-14 20:24:02 UTC (rev 12705)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx">         self.logFile = None
</span><span class="cx">         self.digestCache = {}
</span><span class="cx">         self.postgresLog = &quot;&quot;
</span><ins>+        self.stoponfail = False
</ins><span class="cx">         self.print_request = False
</span><span class="cx">         self.print_response = False
</span><span class="cx">         self.print_request_response_on_error = False
</span><span class="lines">@@ -217,6 +218,7 @@
</span><span class="cx">                 &quot;postgres-log=&quot;,
</span><span class="cx">                 &quot;random&quot;,
</span><span class="cx">                 &quot;random-seed=&quot;,
</span><ins>+                &quot;stop&quot;,
</ins><span class="cx">                 &quot;print-details-onfail&quot;,
</span><span class="cx">                 &quot;always-print-request&quot;,
</span><span class="cx">                 &quot;always-print-response&quot;,
</span><span class="lines">@@ -247,6 +249,8 @@
</span><span class="cx">                 observer_names.append(value)
</span><span class="cx">             elif option == &quot;--postgres-log&quot;:
</span><span class="cx">                 self.postgresLog = value
</span><ins>+            elif option == &quot;--stop&quot;:
+                self.stoponfail = True
</ins><span class="cx">             elif option == &quot;--print-details-onfail&quot;:
</span><span class="cx">                 self.print_request_response_on_error = True
</span><span class="cx">             elif option == &quot;--always-print-request&quot;:
</span><span class="lines">@@ -292,7 +296,7 @@
</span><span class="cx">             self.randomSeed = random_seed
</span><span class="cx"> 
</span><span class="cx">         # Load observers
</span><del>-        map(lambda name: self.loadObserver(name), observer_names if observer_names else [&quot;loadfiles&quot;, &quot;log&quot;, ])
</del><ins>+        map(lambda name: self.loadObserver(name), observer_names if observer_names else [&quot;log&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         self.readXML(sname, fnames, ssl, all)
</span><span class="cx"> 
</span><span class="lines">@@ -317,6 +321,9 @@
</span><span class="cx">                 ok += o
</span><span class="cx">                 failed += f
</span><span class="cx">                 ignored += i
</span><ins>+
+                if failed != 0 and self.stoponfail:
+                    break
</ins><span class="cx">         except:
</span><span class="cx">             failed += 1
</span><span class="cx">             import traceback
</span></span></pre></div>
<a id="CalDAVTestertrunksrcrequestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/request.py (12704 => 12705)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/request.py        2014-02-14 20:22:20 UTC (rev 12704)
+++ CalDAVTester/trunk/src/request.py        2014-02-14 20:24:02 UTC (rev 12705)
</span><span class="lines">@@ -298,6 +298,7 @@
</span><span class="cx">                 finally:
</span><span class="cx">                     fd.close()
</span><span class="cx">             data = str(self.manager.server_info.subs(data))
</span><ins>+            self.manager.server_info.addextrasubs({&quot;$request_count:&quot;: str(self.count)})
</ins><span class="cx">             data = self.manager.server_info.extrasubs(data)
</span><span class="cx">             if self.data.generate:
</span><span class="cx">                 if self.data.content_type.startswith(&quot;text/calendar&quot;):
</span></span></pre>
</div>
</div>

</body>
</html>