[CalendarServer-changes] [7672] CalendarServer/trunk/contrib/migration/test/test_migrator.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jun 27 11:51:29 PDT 2011
Revision: 7672
http://trac.macosforge.org/projects/calendarserver/changeset/7672
Author: glyph at apple.com
Date: 2011-06-27 11:51:29 -0700 (Mon, 27 Jun 2011)
Log Message:
-----------
Fixes to migrator tests; fake pw_uid and gr_gid for systems where 'calendar' might not exist, and make the tests themselves a bit more self-documenting.
Modified Paths:
--------------
CalendarServer/trunk/contrib/migration/test/test_migrator.py
Modified: CalendarServer/trunk/contrib/migration/test/test_migrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/test/test_migrator.py 2011-06-27 16:08:45 UTC (rev 7671)
+++ CalendarServer/trunk/contrib/migration/test/test_migrator.py 2011-06-27 18:51:29 UTC (rev 7672)
@@ -20,6 +20,28 @@
)
import contrib.migration.calendarmigrator
+class FakeUser(object):
+ pw_uid = 6543
+
+
+class FakeGroup(object):
+ gr_gid = 7654
+
+
+class FakePwd(object):
+ def getpwnam(self, nam):
+ if nam != 'calendar':
+ raise RuntimeError("Only 'calendar' user supported for testing.")
+ return FakeUser()
+
+
+class FakeGrp(object):
+ def getgrnam(self, nam):
+ if nam != 'calendar':
+ raise RuntimeError("Only 'calendar' group supported for testing.")
+ return FakeGroup()
+
+
class MigrationTests(twistedcaldav.test.util.TestCase):
"""
Calendar Server Migration Tests
@@ -27,7 +49,10 @@
def setUp(self):
# Disable logging during tests
+
self.patch(contrib.migration.calendarmigrator, "log", lambda _: None)
+ self.patch(contrib.migration.calendarmigrator, "pwd", FakePwd())
+ self.patch(contrib.migration.calendarmigrator, "grp", FakeGrp())
def test_mergeSSL(self):
@@ -480,7 +505,7 @@
"/Library/CalendarServer/Documents", # Old Cal DocRoot value
"/Library/CalendarServer/Data", # Old Cal DataRoot value
"/Library/AddressBookServer/Documents", # Old AB DocRoot value
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -539,7 +564,7 @@
"/Library/CalendarServer/Documents", # Old Cal DocRoot value
"/Library/CalendarServer/Data", # Old Cal DataRoot value
"/Library/AddressBookServer/Documents", # Old AB DocRoot value
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -598,7 +623,7 @@
"/NonStandard/CalendarServer/Documents", # Old Cal DocRoot Value
"/NonStandard/CalendarServer/Data", # Old Cal DataRoot Value
"/NonStandard/AddressBookServer/Documents", # Old AB DocRoot Value
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -657,7 +682,7 @@
"/Volumes/External/CalendarServer/Documents", # Old Cal DocRoot Value
"/Volumes/External/CalendarServer/Data", # Old Cal DataRoot Value
"/Library/AddressBookServer/Documents", # Old AB DocRoot Value
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -701,7 +726,7 @@
None, # Old Cal DocRoot value
None, # Old Cal DataRoot value
"/Library/AddressBookServer/Documents", # Old AB DocRoot value
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -749,7 +774,7 @@
"Documents", # Old Cal DocRoot value
"Data", # Old Cal DataRoot value
None, # Old AB Docs
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -797,7 +822,7 @@
"/Volumes/External/Calendar/Documents", # Old Cal DocRoot value
"/Volumes/External/Calendar/Data", # Old Cal DataRoot value
None, # Old AB Docs
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -845,7 +870,7 @@
"Documents", # Old Cal DocRoot value
"Data", # Old Cal DocRoot value
None, # Old AB Docs
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -896,7 +921,7 @@
"/Volumes/External/CalendarDocuments/", # Old Cal DocRoot value
"/CalendarData", # Old Cal DocRoot value
None, # Old AB Docs
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
)
),
@@ -987,7 +1012,7 @@
"/Library/CalendarServer/Documents", # oldCalDocumentRootValue
"/Library/CalendarServer/Data", # oldCalDataRootValue
"/Library/AddressBookServer/Documents", # oldABDocumentRootValue
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
),
( # expected return values
"/Volumes/new/Library/Server/Calendar and Contacts",
@@ -997,11 +1022,11 @@
),
[ # expected DiskAccessor history
('ditto', '/Volumes/old/Library/CalendarServer/Documents', '/Volumes/new/Library/Server/Calendar and Contacts/Documents'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents', FakeUser.pw_uid, FakeGroup.gr_gid),
('ditto', '/Volumes/old/Library/CalendarServer/Data', '/Volumes/new/Library/Server/Calendar and Contacts/Data'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Data', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Data', FakeUser.pw_uid, FakeGroup.gr_gid),
('ditto', '/Volumes/old/Library/AddressBookServer/Documents/addressbooks', '/Volumes/new/Library/Server/Calendar and Contacts/Documents/addressbooks'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents/addressbooks', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents/addressbooks', FakeUser.pw_uid, FakeGroup.gr_gid),
]
),
@@ -1062,7 +1087,7 @@
"/NonStandard/CalendarServer/Documents", # oldCalDocumentRootValue
"/NonStandard/CalendarServer/Data", # oldCalDataRootValue
"/NonStandard/AddressBookServer/Documents", # oldABDocumentRootValue
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
),
( # expected return values
"/Volumes/new/Library/Server/Calendar and Contacts",
@@ -1072,11 +1097,11 @@
),
[
('ditto', '/Volumes/old/NonStandard/CalendarServer/Documents', '/Volumes/new/Library/Server/Calendar and Contacts/Documents'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents', FakeUser.pw_uid, FakeGroup.gr_gid),
('ditto', '/Volumes/old/NonStandard/CalendarServer/Data', '/Volumes/new/Library/Server/Calendar and Contacts/Data'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Data', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Data', FakeUser.pw_uid, FakeGroup.gr_gid),
('ditto', '/Volumes/old/NonStandard/AddressBookServer/Documents/addressbooks', '/Volumes/new/Library/Server/Calendar and Contacts/Documents/addressbooks'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents/addressbooks', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents/addressbooks', FakeUser.pw_uid, FakeGroup.gr_gid),
]
),
@@ -1137,7 +1162,7 @@
"/Volumes/External/CalendarServer/Documents", # oldCalDocumentRootValue
"/Volumes/External/CalendarServer/Data", # oldCalDataRootValue
"/Library/AddressBookServer/Documents", # oldABDocumentRootValue
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
),
( # expected return values
"/Volumes/new/Library/Server/Calendar and Contacts",
@@ -1147,7 +1172,7 @@
),
[
('ditto', '/Volumes/old/Library/AddressBookServer/Documents/addressbooks', '/Volumes/External/CalendarServer/Documents/addressbooks'),
- ('chown-recursive', '/Volumes/External/CalendarServer/Documents/addressbooks', 93, 93),
+ ('chown-recursive', '/Volumes/External/CalendarServer/Documents/addressbooks', FakeUser.pw_uid, FakeGroup.gr_gid),
]
),
@@ -1198,7 +1223,7 @@
"Documents", # oldCalDocumentRootValue
"Data", # oldCalDataRootValue
None, # oldABDocumentRootValue
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
),
( # expected return values
"/Volumes/new/Library/Server/Calendar and Contacts",
@@ -1208,9 +1233,9 @@
),
[
('ditto', '/Volumes/old/Library/Server/Calendar and Contacts/Documents', '/Volumes/new/Library/Server/Calendar and Contacts/Documents'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Documents', FakeUser.pw_uid, FakeGroup.gr_gid),
('ditto', '/Volumes/old/Library/Server/Calendar and Contacts/Data', '/Volumes/new/Library/Server/Calendar and Contacts/Data'),
- ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Data', 93, 93),
+ ('chown-recursive', '/Volumes/new/Library/Server/Calendar and Contacts/Data', FakeUser.pw_uid, FakeGroup.gr_gid),
]
),
@@ -1261,7 +1286,7 @@
"Documents", # oldCalDocumentRootValue
"Data", # oldCalDataRootValue
None, # oldABDocumentRootValue
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
),
( # expected return values
"/Volumes/External/Library/Server/Calendar and Contacts",
@@ -1322,7 +1347,7 @@
"/Volumes/External/CalendarDocuments/", # oldCalDocumentRootValue
"/CalendarData", # oldCalDataRootValue
None, # oldABDocumentRootValue
- 93, 93, # user id, group id
+ FakeUser.pw_uid, FakeGroup.gr_gid, # user id, group id
),
( # expected return values
"/Volumes/External/Library/Server/Calendar and Contacts",
@@ -1332,7 +1357,7 @@
),
[
('ditto', '/Volumes/old/CalendarData', '/Volumes/External/Library/Server/Calendar and Contacts/Data'),
- ('chown-recursive', '/Volumes/External/Library/Server/Calendar and Contacts/Data', 93, 93),
+ ('chown-recursive', '/Volumes/External/Library/Server/Calendar and Contacts/Data', FakeUser.pw_uid, FakeGroup.gr_gid),
]
),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110627/80e21dc9/attachment-0001.html>
More information about the calendarserver-changes
mailing list