<!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>[13083] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.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/13083">13083</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 19:24:47 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lint</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_resourcespy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_resourcespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py (13082 => 13083)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py        2014-04-01 02:21:36 UTC (rev 13082)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_resources.py        2014-04-01 02:24:47 UTC (rev 13083)
</span><span class="lines">@@ -22,16 +22,16 @@
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><span class="cx"> strGUID = "dsAttrTypeStandard:GeneratedUID"
</span><span class="cx"> strName = "dsAttrTypeStandard:RealName"
</span><del>- RUN_TESTS = True
</del><ins>+
</ins><span class="cx"> except ImportError:
</span><del>- RUN_TESTS = False
</del><ins>+ pass
</ins><span class="cx">
</span><del>-
-
-if RUN_TESTS:
</del><ins>+else:
</ins><span class="cx"> class StubDirectoryRecord(object):
</span><span class="cx">
</span><del>- def __init__(self, recordType, guid=None, shortNames=None, fullName=None):
</del><ins>+ def __init__(
+ self, recordType, guid=None, shortNames=None, fullName=None
+ ):
</ins><span class="cx"> self.recordType = recordType
</span><span class="cx"> self.guid = guid
</span><span class="cx"> self.shortNames = shortNames
</span><span class="lines">@@ -50,13 +50,16 @@
</span><span class="cx"> def createRecords(self, data):
</span><span class="cx"> for recordType, recordData in data:
</span><span class="cx"> guid = recordData["guid"]
</span><del>- record = StubDirectoryRecord(recordType, guid=guid,
- shortNames=recordData['shortNames'],
- fullName=recordData['fullName'])
</del><ins>+ record = StubDirectoryRecord(
+ recordType, guid=guid,
+ shortNames=recordData["shortNames"],
+ fullName=recordData["fullName"]
+ )
</ins><span class="cx"> self.records[guid] = record
</span><span class="cx">
</span><del>- def updateRecord(self, recordType, guid=None, shortNames=None,
- fullName=None):
</del><ins>+ def updateRecord(
+ self, recordType, guid=None, shortNames=None, fullName=None
+ ):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -91,35 +94,46 @@
</span><span class="cx"> def test_migrateResources(self):
</span><span class="cx">
</span><span class="cx"> data = {
</span><del>- "dsRecTypeStandard:Resources":
- [
- ['projector1', {
- strGUID : '6C99E240-E915-4012-82FA-99E0F638D7EF',
- strName : 'Projector 1'
- }],
- ['projector2', {
- strGUID : '7C99E240-E915-4012-82FA-99E0F638D7EF',
- strName : 'Projector 2'
- }],
- ],
- "dsRecTypeStandard:Places":
- [
- ['office1', {
- strGUID : '8C99E240-E915-4012-82FA-99E0F638D7EF',
- strName : 'Office 1'
- }],
- ],
- }
</del><ins>+ "dsRecTypeStandard:Resources":
+ [
+ ["projector1", {
+ strGUID: "6C99E240-E915-4012-82FA-99E0F638D7EF",
+ strName: "Projector 1"
+ }],
+ ["projector2", {
+ strGUID: "7C99E240-E915-4012-82FA-99E0F638D7EF",
+ strName: "Projector 2"
+ }],
+ ],
+ "dsRecTypeStandard:Places":
+ [
+ ["office1", {
+ strGUID: "8C99E240-E915-4012-82FA-99E0F638D7EF",
+ strName: "Office 1"
+ }],
+ ],
+ }
</ins><span class="cx">
</span><span class="cx"> def queryMethod(sourceService, recordType, verbose=False):
</span><span class="cx"> return data[recordType]
</span><span class="cx">
</span><span class="cx"> directoryService = StubDirectoryService(StubAugmentService())
</span><del>- yield migrateResources(None, directoryService, queryMethod=queryMethod)
</del><ins>+ yield migrateResources(
+ None, directoryService, queryMethod=queryMethod
+ )
</ins><span class="cx"> for guid, recordType in (
</span><del>- ('6C99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_resources),
- ('7C99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_resources),
- ('8C99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_locations),
</del><ins>+ (
+ "6C99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_resources
+ ),
+ (
+ "7C99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_resources
+ ),
+ (
+ "8C99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_locations
+ ),
</ins><span class="cx"> ):
</span><span class="cx"> self.assertTrue(guid in directoryService.records)
</span><span class="cx"> record = directoryService.records[guid]
</span><span class="lines">@@ -131,26 +145,43 @@
</span><span class="cx"> # Add more to OD and re-migrate
</span><span class="cx"> #
</span><span class="cx"> data["dsRecTypeStandard:Resources"].append(
</span><del>- ['projector3', {
- strGUID : '9C99E240-E915-4012-82FA-99E0F638D7EF',
- strName : 'Projector 3'
</del><ins>+ ["projector3", {
+ strGUID: "9C99E240-E915-4012-82FA-99E0F638D7EF",
+ strName: "Projector 3"
</ins><span class="cx"> }]
</span><span class="cx"> )
</span><span class="cx"> data["dsRecTypeStandard:Places"].append(
</span><del>- ['office2', {
- strGUID : 'AC99E240-E915-4012-82FA-99E0F638D7EF',
- strName : 'Office 2'
</del><ins>+ ["office2", {
+ strGUID: "AC99E240-E915-4012-82FA-99E0F638D7EF",
+ strName: "Office 2"
</ins><span class="cx"> }]
</span><span class="cx"> )
</span><span class="cx">
</span><del>- yield migrateResources(None, directoryService, queryMethod=queryMethod)
</del><ins>+ yield migrateResources(
+ None, directoryService, queryMethod=queryMethod
+ )
</ins><span class="cx">
</span><span class="cx"> for guid, recordType in (
</span><del>- ('6C99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_resources),
- ('7C99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_resources),
- ('9C99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_resources),
- ('8C99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_locations),
- ('AC99E240-E915-4012-82FA-99E0F638D7EF', DirectoryService.recordType_locations),
</del><ins>+ (
+ "6C99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_resources
+ ),
+ (
+ "7C99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_resources
+ ),
+ (
+ "9C99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_resources
+ ),
+ (
+ "8C99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_locations
+ ),
+ (
+ "AC99E240-E915-4012-82FA-99E0F638D7EF",
+ DirectoryService.recordType_locations
+ ),
</ins><span class="cx"> ):
</span><span class="cx"> self.assertTrue(guid in directoryService.records)
</span><span class="cx"> record = directoryService.records[guid]
</span></span></pre>
</div>
</div>
</body>
</html>