[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [15752] CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
From: source_changes () macosforge ! org
Date: 2016-07-07 16:34:19
Message-ID: 20160707163419.452A9140ED8 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 15752
http://trac.calendarserver.org//changeset/15752
Author: cdaboo@apple.com
Date: 2016-07-07 09:34:18 -0700 (Thu, 07 Jul 2016)
Log Message:
-----------
Remove garbage collection checks as they are not reliable.
Modified Paths:
--------------
CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2016-07-07 16:26:06 UTC (rev 15751)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2016-07-07 16:34:18 UTC (rev 15752)
@@ -52,8 +52,7 @@
from txdav.caldav.datastore.scheduling.itip import iTIPRequestStatus
from txdav.caldav.datastore.scheduling.processing import ImplicitProcessor
from txdav.caldav.datastore.scheduling.scheduler import ScheduleResponseQueue
-from txdav.caldav.datastore.sql import CalendarStoreFeatures, CalendarObject, \
- CalendarHome
+from txdav.caldav.datastore.sql import CalendarStoreFeatures, CalendarObject
from txdav.common.datastore.sql import ECALENDARTYPE, CommonObjectResource, \
CommonStoreTransactionMonitor
from txdav.common.datastore.sql_tables import schema, _BIND_MODE_DIRECT, \
@@ -79,7 +78,6 @@
from twext.enterprise.util import parseSQLTimestamp
import datetime
-import gc
import os
@@ -7819,19 +7817,24 @@
txn = None
yield self.commit()
+ # This does not work reliably as a way to check whether the objects are
+ # gone as other things can hold on to a few (e.g. inlineCallbacks,
+ # tracebacks in deferred etc). For now this is commented out until a
+ # better solution can be used.
+
# Garbage collect then look for the number of home/resource objects and
# make sure only those for user01 still exist
- gc.collect()
- gcobjs = gc.get_objects()
- hcount = 0
- ocount = 0
- for obj in gcobjs:
- if isinstance(obj, CalendarHome):
- hcount += 1
- elif isinstance(obj, CalendarObject):
- ocount += 1
- self.assertTrue(hcount <= 2) # Just user01 home left (maybe user05 too)
- self.assertTrue(ocount <= 4) # Old resource + new resource (and maybe user05 too)
+# gc.collect()
+# gcobjs = gc.get_objects()
+# hcount = 0
+# ocount = 0
+# for obj in gcobjs:
+# if isinstance(obj, CalendarHome):
+# hcount += 1
+# elif isinstance(obj, CalendarObject):
+# ocount += 1
+# self.assertTrue(hcount <= 2) # Just user01 home left (maybe user05 too)
+# self.assertTrue(ocount <= 4) # Old resource + new resource (and maybe user05 too)
@inlineCallbacks
[Attachment #5 (text/html)]
<!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>[15752] CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</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/15752">15752</a></dd> <dt>Author</dt> \
<dd>cdaboo@apple.com</dd> <dt>Date</dt> <dd>2016-07-07 09:34:18 -0700 (Thu, 07 Jul \
2016)</dd> </dl>
<h3>Log Message</h3>
<pre>Remove garbage collection checks as they are not reliable.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (15751 => 15752)</h4> \
<pre class="diff"><span> <span class="info">--- \
CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2016-07-07 16:26:06 UTC \
(rev 15751)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2016-07-07 16:34:18 \
UTC (rev 15752) </span><span class="lines">@@ -52,8 +52,7 @@
</span><span class="cx"> from txdav.caldav.datastore.scheduling.itip import \
iTIPRequestStatus </span><span class="cx"> from \
txdav.caldav.datastore.scheduling.processing import ImplicitProcessor </span><span \
class="cx"> from txdav.caldav.datastore.scheduling.scheduler import \
ScheduleResponseQueue </span><del>-from txdav.caldav.datastore.sql import \
CalendarStoreFeatures, CalendarObject, \
- CalendarHome
</del><ins>+from txdav.caldav.datastore.sql import CalendarStoreFeatures, \
CalendarObject </ins><span class="cx"> from txdav.common.datastore.sql import \
ECALENDARTYPE, CommonObjectResource, \ </span><span class="cx"> \
CommonStoreTransactionMonitor </span><span class="cx"> from \
txdav.common.datastore.sql_tables import schema, _BIND_MODE_DIRECT, \ </span><span \
class="lines">@@ -79,7 +78,6 @@ </span><span class="cx"> from twext.enterprise.util \
import parseSQLTimestamp </span><span class="cx">
</span><span class="cx"> import datetime
</span><del>-import gc
</del><span class="cx"> import os
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -7819,19 +7817,24 @@
</span><span class="cx"> txn = None
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # This does not work reliably as a way to check whether the \
objects are + # gone as other things can hold on to a few (e.g. \
inlineCallbacks, + # tracebacks in deferred etc). For now this is commented \
out until a + # better solution can be used.
+
</ins><span class="cx"> # Garbage collect then look for the number of \
home/resource objects and </span><span class="cx"> # make sure only those for \
user01 still exist </span><del>- gc.collect()
- gcobjs = gc.get_objects()
- hcount = 0
- ocount = 0
- for obj in gcobjs:
- if isinstance(obj, CalendarHome):
- hcount += 1
- elif isinstance(obj, CalendarObject):
- ocount += 1
- self.assertTrue(hcount <= 2) # Just user01 home left (maybe user05 too)
- self.assertTrue(ocount <= 4) # Old resource + new resource (and maybe \
user05 too) </del><ins>+# gc.collect()
+# gcobjs = gc.get_objects()
+# hcount = 0
+# ocount = 0
+# for obj in gcobjs:
+# if isinstance(obj, CalendarHome):
+# hcount += 1
+# elif isinstance(obj, CalendarObject):
+# ocount += 1
+# self.assertTrue(hcount <= 2) # Just user01 home left (maybe user05 too)
+# self.assertTrue(ocount <= 4) # Old resource + new resource (and maybe \
user05 too) </ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic