[CalendarServer-changes] [11927] CalendarServer/trunk/twext/who/test

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:22:30 PDT 2014


Revision: 11927
          http://trac.calendarserver.org//changeset/11927
Author:   wsanchez at apple.com
Date:     2013-11-08 17:15:59 -0800 (Fri, 08 Nov 2013)
Log Message:
-----------
dedent

Modified Paths:
--------------
    CalendarServer/trunk/twext/who/test/test_directory.py
    CalendarServer/trunk/twext/who/test/test_xml.py

Modified: CalendarServer/trunk/twext/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_directory.py	2013-11-09 00:58:52 UTC (rev 11926)
+++ CalendarServer/trunk/twext/who/test/test_directory.py	2013-11-09 01:15:59 UTC (rev 11927)
@@ -19,6 +19,7 @@
 """
 
 from uuid import UUID
+from textwrap import dedent
 
 from zope.interface.verify import verifyObject, BrokenMethodImplementation
 
@@ -669,18 +670,20 @@
         """
         C{description} returns the expected string.
         """
-        wsanchez = self.makeRecord(self.fields_wsanchez)
+        sagen = self.makeRecord(self.fields_sagen)
 
         self.assertEquals(
-u"""
-DirectoryRecord:
-  UID = UID:wsanchez
-  record type = user
-  short names = (u'wsanchez', u'wilfredo_sanchez')
-  full names = (u'Wilfredo Sanchez', u'Wilfredo Sanchez Vega')
-  email addresses = ('wsanchez at calendarserver.org', 'wsanchez at example.com')
-"""[1:],
-            wsanchez.description()
+            dedent(
+                u"""
+                DirectoryRecord:
+                  UID = UID:sagen
+                  record type = user
+                  short names = (u'sagen',)
+                  full names = (u'Morgen Sagen',)
+                  email addresses = ('sagen at calendarserver.org',)
+                """[1:]
+            ),
+            sagen.description()
         )
 
 

Modified: CalendarServer/trunk/twext/who/test/test_xml.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_xml.py	2013-11-09 00:58:52 UTC (rev 11926)
+++ CalendarServer/trunk/twext/who/test/test_xml.py	2013-11-09 01:15:59 UTC (rev 11927)
@@ -20,6 +20,7 @@
 
 from time import sleep
 from uuid import UUID
+from textwrap import dedent
 
 from twisted.trial import unittest
 from twisted.python.filepath import FilePath
@@ -218,12 +219,13 @@
 
 
     def test_badRootElement(self):
-        service = self.service(xmlData=(
-b"""<?xml version="1.0" encoding="utf-8"?>
+        service = self.service(xmlData=(dedent(
+            b"""
+            <?xml version="1.0" encoding="utf-8"?>
 
-<frobnitz />
-"""
-        ))
+            <frobnitz />
+            """[1:]
+        )))
 
         self.assertRaises(ParseError, service.loadRecords)
         try:
@@ -235,12 +237,13 @@
 
 
     def test_noRealmName(self):
-        service = self.service(xmlData=(
-b"""<?xml version="1.0" encoding="utf-8"?>
+        service = self.service(xmlData=(dedent(
+            b"""
+            <?xml version="1.0" encoding="utf-8"?>
 
-<directory />
-"""
-        ))
+            <directory />
+            """[1:]
+        )))
 
         self.assertRaises(ParseError, service.loadRecords)
         try:
@@ -257,18 +260,19 @@
 
 
     def test_unknownFieldElementsDirty(self):
-        service = self.service(xmlData=(
-b"""<?xml version="1.0" encoding="utf-8"?>
+        service = self.service(xmlData=(dedent(
+            b"""
+            <?xml version="1.0" encoding="utf-8"?>
 
-<directory realm="Unknown Record Types">
-  <record type="user">
-    <uid>__wsanchez__</uid>
-    <short-name>wsanchez</short-name>
-    <political-affiliation>Community and Freedom Party</political-affiliation>
-  </record>
-</directory>
-"""
-        ))
+            <directory realm="Unknown Record Types">
+              <record type="user">
+                <uid>__wsanchez__</uid>
+                <short-name>wsanchez</short-name>
+                <political-affiliation>Community and Freedom Party</political-affiliation>
+              </record>
+            </directory>
+            """[1:]
+        )))
         self.assertEquals(
             set(service.unknownFieldElements),
             set((u"political-affiliation",))
@@ -281,18 +285,19 @@
 
 
     def test_unknownRecordTypesDirty(self):
-        service = self.service(xmlData=(
-b"""<?xml version="1.0" encoding="utf-8"?>
+        service = self.service(xmlData=(dedent(
+            b"""
+            <?xml version="1.0" encoding="utf-8"?>
 
-<directory realm="Unknown Record Types">
-  <record type="camera">
-    <uid>__d600__</uid>
-    <short-name>d600</short-name>
-    <full-name>Nikon D600</full-name>
-  </record>
-</directory>
-"""
-        ))
+            <directory realm="Unknown Record Types">
+              <record type="camera">
+                <uid>__d600__</uid>
+                <short-name>d600</short-name>
+                <full-name>Nikon D600</full-name>
+              </record>
+            </directory>
+            """[1:]
+        )))
         self.assertEquals(set(service.unknownRecordTypes), set((u"camera",)))
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/94cf6898/attachment.html>


More information about the calendarserver-changes mailing list