<!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>[11418] 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/11418">11418</a></dd>
<dt>Author</dt> <dd>glyph@apple.com</dd>
<dt>Date</dt> <dd>2013-06-26 01:15:25 -0700 (Wed, 26 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Bytes, not unicode; start thinking about acutal 'checkin' function; some simple verification for subprocess checkin test harness.</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 (11417 => 11418)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/launchd.py        2013-06-26 08:15:07 UTC (rev 11417)
+++ CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/launchd.py        2013-06-26 08:15:25 UTC (rev 11418)
</span><span class="lines">@@ -21,6 +21,8 @@
</span><span class="cx"> 
</span><span class="cx"> from __future__ import print_function
</span><span class="cx"> 
</span><ins>+import sys
+
</ins><span class="cx"> from cffi import FFI
</span><span class="cx"> 
</span><span class="cx"> ffi = FFI()
</span><span class="lines">@@ -183,9 +185,7 @@
</span><span class="cx">         cvalue = lib.launch_data_get_string(launchvalue)
</span><span class="cx">         if cvalue == ffi.NULL:
</span><span class="cx">             return None
</span><del>-        pybytes = ffi.string(cvalue)
-        pyunicode = pybytes.decode('utf-8')
-        return pyunicode
</del><ins>+        return ffi.string(cvalue)
</ins><span class="cx">     elif dtype == lib.LAUNCH_DATA_OPAQUE:
</span><span class="cx">         return launchvalue
</span><span class="cx">     elif dtype == lib.LAUNCH_DATA_ERRNO:
</span><span class="lines">@@ -195,8 +195,14 @@
</span><span class="cx">     else:
</span><span class="cx">         raise TypeError(&quot;Unknown Launch Data Type&quot;, dtype)
</span><span class="cx"> 
</span><del>-import sys
</del><span class="cx"> 
</span><ins>+
+def checkin():
+    &quot;&quot;&quot;
+    Perform a launchd checkin, returning a Pythonic wrapped data structure
+    representing the retrieved check-in plist.
+    &quot;&quot;&quot;
+
</ins><span class="cx"> def getLaunchDSocketFDs():
</span><span class="cx">     result = {}
</span><span class="cx">     req = lib.launch_data_new_string(lib.LAUNCH_KEY_CHECKIN)
</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 (11417 => 11418)</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:15:07 UTC (rev 11417)
+++ CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext/python/test/test_launchd.py        2013-06-26 08:15:25 UTC (rev 11418)
</span><span class="lines">@@ -18,9 +18,22 @@
</span><span class="cx"> Tests for L{twext.python.launchd}.
</span><span class="cx"> &quot;&quot;&quot;
</span><span class="cx"> 
</span><ins>+import sys, os, plistlib
+
+if __name__ == '__main__':
+    import time
+    sys.stdout.write(&quot;HELLO WORLD\n&quot;)
+    sys.stderr.write(&quot;ERROR WORLD\n&quot;)
+    sys.stdout.flush()
+    sys.stderr.flush()
+    time.sleep(1)
+    sys.exit(0)
+
+
</ins><span class="cx"> from twext.python.launchd import lib, ffi, LaunchDictionary, LaunchArray
</span><span class="cx"> 
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><ins>+from twisted.python.filepath import FilePath
</ins><span class="cx"> 
</span><span class="cx"> class DictionaryTests(TestCase):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="lines">@@ -61,7 +74,7 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         dictionary = LaunchDictionary(self.testDict)
</span><span class="cx">         self.assertEquals(set(dictionary.keys()),
</span><del>-                          set([u&quot;alpha&quot;, u&quot;beta&quot;, u&quot;gamma&quot;]))
</del><ins>+                          set([b&quot;alpha&quot;, b&quot;beta&quot;, b&quot;gamma&quot;]))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def test_launchDictionaryValues(self):
</span><span class="lines">@@ -71,7 +84,7 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         dictionary = LaunchDictionary(self.testDict)
</span><span class="cx">         self.assertEquals(set(dictionary.values()),
</span><del>-                          set([u&quot;alpha-value&quot;, u&quot;beta-value&quot;, 3]))
</del><ins>+                          set([b&quot;alpha-value&quot;, b&quot;beta-value&quot;, 3]))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def test_launchDictionaryItems(self):
</span><span class="lines">@@ -81,8 +94,8 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         dictionary = LaunchDictionary(self.testDict)
</span><span class="cx">         self.assertEquals(set(dictionary.items()),
</span><del>-                          set([(u&quot;alpha&quot;, u&quot;alpha-value&quot;),
-                               (u&quot;beta&quot;, u&quot;beta-value&quot;), (u&quot;gamma&quot;, 3)]))
</del><ins>+                          set([(b&quot;alpha&quot;, b&quot;alpha-value&quot;),
+                               (b&quot;beta&quot;, b&quot;beta-value&quot;), (b&quot;gamma&quot;, 3)]))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ArrayTests(TestCase):
</span><span class="lines">@@ -122,8 +135,8 @@
</span><span class="cx">         C{LaunchArray(...)[n]} returns the n'th element in the array.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         array = LaunchArray(self.testArray)
</span><del>-        self.assertEquals(array[0], u&quot;test-string-1&quot;)
-        self.assertEquals(array[1], u&quot;another string.&quot;)
</del><ins>+        self.assertEquals(array[0], b&quot;test-string-1&quot;)
+        self.assertEquals(array[1], b&quot;another string.&quot;)
</ins><span class="cx">         self.assertEquals(array[2], 4321)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -142,8 +155,42 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         array = LaunchArray(self.testArray)
</span><span class="cx">         i = iter(array)
</span><del>-        self.assertEquals(i.next(), u&quot;test-string-1&quot;)
-        self.assertEquals(i.next(), u&quot;another string.&quot;)
</del><ins>+        self.assertEquals(i.next(), b&quot;test-string-1&quot;)
+        self.assertEquals(i.next(), b&quot;another string.&quot;)
</ins><span class="cx">         self.assertEquals(i.next(), 4321)
</span><span class="cx">         self.assertRaises(StopIteration, i.next)
</span><span class="cx"> 
</span><ins>+
+
+class CheckInTests(TestCase):
+    &quot;&quot;&quot;
+    Integration tests making sure that actual checkin with launchd results in
+    the expected values.
+    &quot;&quot;&quot;
+
+    def setUp(self):
+        fp = FilePath(self.mktemp())
+        fp.makedirs()
+        plist = {
+            &quot;Label&quot;: &quot;org.calendarserver.UNIT-TESTS.&quot; + repr(os.getpid()),
+            &quot;ProgramArguments&quot;: [sys.executable, &quot;-m&quot;, __name__],
+            &quot;EnvironmentVariables&quot;: dict(os.environ),
+            &quot;KeepAlive&quot;: False,
+            &quot;StandardOutPath&quot;: fp.child(&quot;stdout.txt&quot;).path,
+            &quot;StandardErrorPath&quot;: fp.child(&quot;stderr.txt&quot;).path,
+            &quot;RunAtLoad&quot;: True,
+        }
+        self.job = fp.child(&quot;job.plist&quot;)
+        self.job.setContent(plistlib.writePlistToString(plist))
+        os.spawnlp(os.P_WAIT, &quot;launchctl&quot;, &quot;launchctl&quot;, &quot;load&quot;, self.job.path)
+
+
+    def test_something(self):
+        &quot;&quot;&quot;
+        Test something.
+        &quot;&quot;&quot;
+
+
+    def tearDown(self):
+        os.spawnlp(os.P_WAIT, &quot;launchctl&quot;, &quot;launchctl&quot;, &quot;unload&quot;, self.job.path)
+
</ins></span></pre>
</div>
</div>

</body>
</html>