[CalendarServer-changes] [13091] CalendarServer/trunk/calendarserver/tools/test/test_gateway.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Apr 1 10:38:01 PDT 2014


Revision: 13091
          http://trac.calendarserver.org//changeset/13091
Author:   wsanchez at apple.com
Date:     2014-04-01 10:38:01 -0700 (Tue, 01 Apr 2014)
Log Message:
-----------
Don't invoke gateway tool with python

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/test/test_gateway.py

Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py	2014-04-01 17:05:55 UTC (rev 13090)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py	2014-04-01 17:38:01 UTC (rev 13091)
@@ -87,17 +87,16 @@
             command = command.encode("utf-8")
 
         sourceRoot = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-        python = sys.executable
-        script = os.path.join(sourceRoot, "bin", script)
+        cmd = os.path.join(sourceRoot, "bin", script)
 
-        args = [python, script, "-f", self.configFileName]
+        args = [cmd, "-f", self.configFileName]
         if error:
             args.append("--error")
 
         cwd = sourceRoot
 
         deferred = Deferred()
-        reactor.spawnProcess(CapturingProcessProtocol(deferred, command), python, args, env=os.environ, path=cwd)
+        reactor.spawnProcess(CapturingProcessProtocol(deferred, command), cmd, args, env=os.environ, path=cwd)
         output = yield deferred
         try:
             plist = readPlistFromString(output)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140401/103b40f7/attachment.html>


More information about the calendarserver-changes mailing list