<!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>[14914] CalendarServer/branches/users/cdaboo/cfod</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/14914">14914</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-25 11:47:00 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>More PyPy fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboocfodtwistedcaldavsqlpy">CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_databasepy">CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_database.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_sqlpy">CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_sql.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_timezonespy">CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_timezones.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_upgradepy">CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_upgrade.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodtwistedcaldavupgradepy">CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/upgrade.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboocfodtxdavcaldavdatastoretesttest_filepy">CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_file.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboocfodtwistedcaldavsqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/sql.py (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/sql.py 2015-06-24 19:47:21 UTC (rev 14913)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/sql.py 2015-06-25 18:47:00 UTC (rev 14914)
</span><span class="lines">@@ -192,17 +192,17 @@
</span><span class="cx"> # want other processes to get stomped on or stomp on us.
</span><span class="cx"> old_isolation = self._db_connection.isolation_level
</span><span class="cx"> self._db_connection.isolation_level = None
</span><del>- q.execute("begin exclusive transaction")
</del><ins>+ try:
+ q.execute("begin exclusive transaction")
</ins><span class="cx">
</span><del>- # We re-check whether the schema table is present again AFTER we've got an exclusive
- # lock as some other server process may have snuck in and already created it
- # before we got the lock, or whilst we were waiting for it.
- if not self._test_schema_table(q):
- self._db_init_schema_table(q)
- self._db_init_data_tables(q)
- self._db_recreate(False)
</del><ins>+ # We re-check whether the schema table is present again AFTER we've got an exclusive
+ # lock as some other server process may have snuck in and already created it
+ # before we got the lock, or whilst we were waiting for it.
+ if not self._test_schema_table(q):
+ self._db_init_schema_table(q)
+ self._db_init_data_tables(q)
+ self._db_recreate(False)
</ins><span class="cx">
</span><del>- try:
</del><span class="cx"> q.execute("commit")
</span><span class="cx"> except DatabaseError:
</span><span class="cx"> pass
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_databasepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_database.py (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_database.py 2015-06-24 19:47:21 UTC (rev 14913)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_database.py 2015-06-25 18:47:00 UTC (rev 14914)
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx"> self.assertFalse(db.initialized)
</span><span class="cx"> yield db.open()
</span><span class="cx"> self.assertTrue(db.initialized)
</span><ins>+ db.close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -154,6 +155,7 @@
</span><span class="cx"> self.assertEqual(items, (("FOO", "BAR"),))
</span><span class="cx"> items = (yield db.queryList("SELECT * from TESTTYPE"))
</span><span class="cx"> self.assertEqual(items, ("FOO",))
</span><ins>+ db.close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -189,6 +191,7 @@
</span><span class="cx"> yield self.inlineCallbackRaises(Database.TestDBRecreateUpgrade.RecreateDBException, db.open)
</span><span class="cx"> items = (yield db.query("SELECT * from TESTTYPE"))
</span><span class="cx"> self.assertEqual(items, ())
</span><ins>+ db.close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -215,6 +218,7 @@
</span><span class="cx"> yield db.open()
</span><span class="cx"> items = (yield db.query("SELECT * from TESTTYPE"))
</span><span class="cx"> self.assertEqual(items, (("FOO", "BAR"),))
</span><ins>+ db.close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -235,3 +239,4 @@
</span><span class="cx"> yield db.open()
</span><span class="cx"> items = (yield db.query("SELECT * from TESTTYPE"))
</span><span class="cx"> self.assertEqual(items, (("FOO", "BAR"),))
</span><ins>+ db.close()
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_sql.py (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_sql.py 2015-06-24 19:47:21 UTC (rev 14913)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_sql.py 2015-06-25 18:47:00 UTC (rev 14914)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> self.assertFalse(hasattr(db, "_db_connection"))
</span><span class="cx"> self.assertTrue(db._db() is not None)
</span><span class="cx"> self.assertTrue(db._db_connection is not None)
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_connect_autocommit(self):
</span><span class="lines">@@ -117,6 +118,7 @@
</span><span class="cx"> self.assertFalse(hasattr(db, "_db_connection"))
</span><span class="cx"> self.assertTrue(db._db() is not None)
</span><span class="cx"> self.assertTrue(db._db_connection is not None)
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_readwrite(self):
</span><span class="lines">@@ -129,6 +131,7 @@
</span><span class="cx"> q = db._db().execute("SELECT * from TESTTYPE")
</span><span class="cx"> items = [i for i in q.fetchall()]
</span><span class="cx"> self.assertEqual(items, [("FOO", "BAR")])
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_readwrite_autocommit(self):
</span><span class="lines">@@ -140,6 +143,7 @@
</span><span class="cx"> q = db._db().execute("SELECT * from TESTTYPE")
</span><span class="cx"> items = [i for i in q.fetchall()]
</span><span class="cx"> self.assertEqual(items, [("FOO", "BAR")])
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_readwrite_cursor(self):
</span><span class="lines">@@ -150,6 +154,7 @@
</span><span class="cx"> db._db_execute("INSERT into TESTTYPE (KEY, VALUE) values (:1, :2)", "FOO", "BAR")
</span><span class="cx"> items = db._db_execute("SELECT * from TESTTYPE")
</span><span class="cx"> self.assertEqual(items, [("FOO", "BAR")])
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_readwrite_cursor_autocommit(self):
</span><span class="lines">@@ -160,6 +165,7 @@
</span><span class="cx"> db._db_execute("INSERT into TESTTYPE (KEY, VALUE) values (:1, :2)", "FOO", "BAR")
</span><span class="cx"> items = db._db_execute("SELECT * from TESTTYPE")
</span><span class="cx"> self.assertEqual(items, [("FOO", "BAR")])
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_readwrite_rollback(self):
</span><span class="lines">@@ -171,6 +177,7 @@
</span><span class="cx"> db._db_rollback()
</span><span class="cx"> items = db._db_execute("SELECT * from TESTTYPE")
</span><span class="cx"> self.assertEqual(items, [])
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_close(self):
</span><span class="lines">@@ -194,6 +201,7 @@
</span><span class="cx"> try:
</span><span class="cx"> db = SQL.TestDBPauseInInit(dbname)
</span><span class="cx"> db._db()
</span><ins>+ db._db_close()
</ins><span class="cx"> self.result = True
</span><span class="cx"> except:
</span><span class="cx"> self.result = False
</span><span class="lines">@@ -224,6 +232,7 @@
</span><span class="cx"> self.assertRaises(SQL.TestDBRecreateUpgrade.RecreateDBException, db._db)
</span><span class="cx"> items = db._db_execute("SELECT * from TESTTYPE")
</span><span class="cx"> self.assertEqual(items, [])
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_version_upgrade_persistent(self):
</span><span class="lines">@@ -249,6 +258,7 @@
</span><span class="cx"> self.assertTrue(db._db() is not None)
</span><span class="cx"> items = db._db_execute("SELECT * from TESTTYPE")
</span><span class="cx"> self.assertEqual(items, [("FOO", "BAR")])
</span><ins>+ db._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_version_upgrade_persistent_add_index(self):
</span><span class="lines">@@ -268,3 +278,4 @@
</span><span class="cx"> self.assertTrue(db._db() is not None)
</span><span class="cx"> items = db._db_execute("SELECT * from TESTTYPE")
</span><span class="cx"> self.assertEqual(items, [("FOO", "BAR")])
</span><ins>+ db._db_close()
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_timezonespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_timezones.py (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_timezones.py 2015-06-24 19:47:21 UTC (rev 14913)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_timezones.py 2015-06-25 18:47:00 UTC (rev 14914)
</span><span class="lines">@@ -325,3 +325,5 @@
</span><span class="cx">
</span><span class="cx"> self.assertTrue(os.path.exists(os.path.join(config.DataRoot, "zoneinfo")))
</span><span class="cx"> self.assertTrue(os.path.exists(os.path.join(config.DataRoot, "zoneinfo", "America", "New_York.ics")))
</span><ins>+
+ test_copyPackage_Concurrency.skip = "This tests needs to use separate processes rather than threads to work properly as the FilesystemLock object is process-based "
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodtwistedcaldavtesttest_upgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_upgrade.py (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_upgrade.py 2015-06-24 19:47:21 UTC (rev 14913)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/test/test_upgrade.py 2015-06-25 18:47:00 UTC (rev 14914)
</span><span class="lines">@@ -1502,6 +1502,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><ins>+ sqliteProxyService.close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_resourcesXML(self):
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodtwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/upgrade.py (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/upgrade.py 2015-06-24 19:47:21 UTC (rev 14913)
+++ CalendarServer/branches/users/cdaboo/cfod/twistedcaldav/upgrade.py 2015-06-25 18:47:00 UTC (rev 14914)
</span><span class="lines">@@ -1077,6 +1077,7 @@
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> # Remove the old file
</span><ins>+ service.close()
</ins><span class="cx"> os.remove(service.dbpath)
</span><span class="cx"> journalPath = service.dbpath + "-journal"
</span><span class="cx"> if os.path.exists(journalPath):
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboocfodtxdavcaldavdatastoretesttest_filepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_file.py (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_file.py 2015-06-24 19:47:21 UTC (rev 14913)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_file.py 2015-06-25 18:47:00 UTC (rev 14914)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> # FileStorageTests, or implementation-agnostic methods on CommonTests.
</span><span class="cx">
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><ins>+from twext.enterprise.ienterprise import AlreadyFinishedError
</ins><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.trial import unittest
</span><span class="lines">@@ -116,6 +117,15 @@
</span><span class="cx"> setUpCalendarStore(self)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def tearDown(self):
+ super(CalendarStoreTest, self).tearDown()
+ try:
+ yield self.txn.commit()
+ except AlreadyFinishedError:
+ pass
+
+
</ins><span class="cx"> def test_calendarHomeWithUID_dot(self):
</span><span class="cx"> """
</span><span class="cx"> Filenames starting with "." are reserved by this
</span><span class="lines">@@ -136,6 +146,15 @@
</span><span class="cx"> return setUpHome1(self)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def tearDown(self):
+ super(CalendarHomeTest, self).tearDown()
+ try:
+ yield self.txn.commit()
+ except AlreadyFinishedError:
+ pass
+
+
</ins><span class="cx"> def test_init(self):
</span><span class="cx"> """
</span><span class="cx"> L{CalendarHome} has C{_path} and L{_calendarStore} attributes,
</span><span class="lines">@@ -194,6 +213,15 @@
</span><span class="cx"> return setUpCalendar1(self)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def tearDown(self):
+ super(CalendarTest, self).tearDown()
+ try:
+ yield self.txn.commit()
+ except AlreadyFinishedError:
+ pass
+
+
</ins><span class="cx"> def test_init(self):
</span><span class="cx"> """
</span><span class="cx"> L{Calendar.__init__} sets private attributes to reflect its constructor
</span><span class="lines">@@ -231,6 +259,7 @@
</span><span class="cx"> index = calendar._index
</span><span class="cx"> self.assertEquals(set((yield index.calendarObjects())),
</span><span class="cx"> set((yield calendar.calendarObjects())))
</span><ins>+ index._oldIndex._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -376,11 +405,13 @@
</span><span class="cx"> (yield self.calendar1.calendarObjectWithName("1.ics")).component(),
</span><span class="cx"> VComponent.fromString(event1modified_text)
</span><span class="cx"> )
</span><ins>+ index = self.calendar1._index
</ins><span class="cx"> yield self.doThenUndo()
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> (yield self.calendar1.calendarObjectWithName("1.ics")).component(),
</span><span class="cx"> originalComponent
</span><span class="cx"> )
</span><ins>+ index._oldIndex._db_close()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @testUnimplemented
</span><span class="lines">@@ -418,6 +449,15 @@
</span><span class="cx"> self.object1 = yield self.calendar1.calendarObjectWithName("1.ics")
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def tearDown(self):
+ super(CalendarObjectTest, self).tearDown()
+ try:
+ yield self.txn.commit()
+ except AlreadyFinishedError:
+ pass
+
+
</ins><span class="cx"> def test_init(self):
</span><span class="cx"> """
</span><span class="cx"> L{CalendarObject} has instance attributes, C{_path} and C{_calendar},
</span></span></pre>
</div>
</div>
</body>
</html>