<!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>[11422] CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python</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/11422">11422</a></dd>
<dt>Author</dt> <dd>glyph@apple.com</dd>
<dt>Date</dt> <dd>2013-06-26 01:16:54 -0700 (Wed, 26 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Start writing test for checkin, need to convert launchd structures to python structures to get them between the processes again...</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersglyphlaunchdwrapperbistwextpythonlaunchdpy">CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/launchd.py</a></li>
<li><a href="#CalendarServerbranchesusersglyphlaunchdwrapperbistwextpythontesttest_launchdpy">CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/test/test_launchd.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersglyphlaunchdwrapperbistwextpythonlaunchdpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/launchd.py (11421 => 11422)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/launchd.py        2013-06-26 08:16:30 UTC (rev 11421)
+++ CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/launchd.py        2013-06-26 08:16:54 UTC (rev 11422)
</span><span class="lines">@@ -151,6 +151,21 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+def plainPython(x):
+    &quot;&quot;&quot;
+    Convert a launchd python-like data structure into regular Python
+    dictionaries and lists.
+    &quot;&quot;&quot;
+    if isinstance(x, LaunchDictionary):
+        result = {}
+        result.update(x)
+        return result
+    elif isinstance(x, LaunchArray):
+        result = []
+
+
+
+
</ins><span class="cx"> class LaunchErrno(Exception):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Error from launchd.
</span></span></pre></div>
<a id="CalendarServerbranchesusersglyphlaunchdwrapperbistwextpythontesttest_launchdpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/test/test_launchd.py (11421 => 11422)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/test/test_launchd.py        2013-06-26 08:16:30 UTC (rev 11421)
+++ CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/test/test_launchd.py        2013-06-26 08:16:54 UTC (rev 11422)
</span><span class="lines">@@ -24,14 +24,16 @@
</span><span class="cx">     testID = sys.argv[1]
</span><span class="cx">     a, b = testID.rsplit(&quot;.&quot;, 1)
</span><span class="cx">     from twisted.python.reflect import namedAny
</span><del>-    namedAny(&quot;.&quot;.join([a, b.replace(&quot;test_&quot;, &quot;job_&quot;)]))()
-    skt = socket.socket()
-    skt.connect((&quot;127.0.0.1&quot;, int(os.environ[&quot;TESTING_PORT&quot;])))
</del><ins>+    try:
+        namedAny(&quot;.&quot;.join([a, b.replace(&quot;test_&quot;, &quot;job_&quot;)]))()
+    finally:
+        skt = socket.socket()
+        skt.connect((&quot;127.0.0.1&quot;, int(os.environ[&quot;TESTING_PORT&quot;])))
</ins><span class="cx">     sys.exit(0)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> from twext.python.launchd import (lib, ffi, LaunchDictionary, LaunchArray,
</span><del>-                                  _managed, constants)
</del><ins>+                                  _managed, constants, plainPython)
</ins><span class="cx"> 
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="lines">@@ -98,6 +100,16 @@
</span><span class="cx">                                (b&quot;beta&quot;, b&quot;beta-value&quot;), (b&quot;gamma&quot;, 3)]))
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    def test_launchDictionaryPlainPython(self):
+        &quot;&quot;&quot;
+        L{plainPython} will convert a L{LaunchDictionary} into a Python
+        dictionary.
+        &quot;&quot;&quot;
+        self.assertEquals({b&quot;alpha&quot;: b&quot;alpha-value&quot;, b&quot;beta&quot;: b&quot;beta-value&quot;,
+                           b&quot;gamma&quot;: 3},
+                           plainPython(LaunchDictionary(self.testDict)))
+
+
</ins><span class="cx"> class ArrayTests(TestCase):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Tests for L{LaunchArray}
</span><span class="lines">@@ -220,8 +232,8 @@
</span><span class="cx">         return d
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    @classmethod
-    def job_test(self):
</del><ins>+    @staticmethod
+    def job_test():
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Do something observable in a subprocess.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -237,7 +249,20 @@
</span><span class="cx">         self.assertEquals(&quot;Sample Value.&quot;, self.stdout.getContent())
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    @staticmethod
+    def job_checkin():
+        &quot;&quot;&quot;
+        Check in in the subprocess.
+        &quot;&quot;&quot;
+        checkin()
</ins><span class="cx"> 
</span><ins>+
+    def test_checkin(self):
+        &quot;&quot;&quot;
+        Checking in results 
+        &quot;&quot;&quot;
+
+
</ins><span class="cx">     def tearDown(self):
</span><span class="cx">         os.spawnlp(os.P_WAIT, &quot;launchctl&quot;, &quot;launchctl&quot;, &quot;unload&quot;, self.job.path)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>