[CalendarServer-changes] [14727] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14727
          http://trac.calendarserver.org//changeset/14727
Author:   cdaboo at apple.com
Date:     2015-05-01 09:17:09 -0700 (Fri, 01 May 2015)
Log Message:
-----------
More fixes for linux unit tests.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
    CalendarServer/trunk/twistedcaldav/test/util.py

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2015-04-30 19:26:23 UTC (rev 14726)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2015-05-01 16:17:09 UTC (rev 14727)
@@ -1334,7 +1334,7 @@
         START and STOP appear in the process output.
         """
         # Inherit the reactor used to run trial
-        reactorArg = ""
+        reactorArg = "--reactor=select"
         for arg in sys.argv:
             if arg.startswith("--reactor"):
                 reactorArg = arg
@@ -1346,7 +1346,7 @@
         proc = reactor.spawnProcess(
             CapturingProcessProtocol(deferred, None),
             sys.executable,
-            [sys.executable, twistd, reactorArg, '-n', '-y', tacFilePath],
+            [sys.executable, '-W', 'ignore', twistd, reactorArg, '-n', '-y', tacFilePath],
             env=os.environ
         )
         reactor.callLater(3, proc.signalProcess, "HUP")

Modified: CalendarServer/trunk/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/util.py	2015-04-30 19:26:23 UTC (rev 14726)
+++ CalendarServer/trunk/twistedcaldav/test/util.py	2015-05-01 16:17:09 UTC (rev 14727)
@@ -564,7 +564,7 @@
         Some output was received on stderr.
         """
         # Ignore the Postgres "NOTICE" output
-        if "NOTICE" in data:
+        if not data or "NOTICE" in data or "PowmInsecureWarning" in data:
             return
 
         self.error.append(data)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150501/2d6797cd/attachment.html>