[CalendarServer-changes] [13090] CalendarServer/trunk/calendarserver/tools/test/test_principals.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Apr 1 10:05:56 PDT 2014
Revision: 13090
http://trac.calendarserver.org//changeset/13090
Author: wsanchez at apple.com
Date: 2014-04-01 10:05:55 -0700 (Tue, 01 Apr 2014)
Log Message:
-----------
Don't invoke gateway tool with python
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/test/test_principals.py
Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-04-01 16:31:46 UTC (rev 13089)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-04-01 17:05:55 UTC (rev 13090)
@@ -89,15 +89,14 @@
Run calendarserver_manage_principals, passing additional as args.
"""
sourceRoot = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
- python = sys.executable
- script = os.path.join(sourceRoot, "bin", "calendarserver_manage_principals")
+ cmd = os.path.join(sourceRoot, "bin", "calendarserver_manage_principals")
- args = [python, script, "-f", self.configFileName]
+ args = [cmd, "-f", self.configFileName]
args.extend(additional)
cwd = sourceRoot
deferred = Deferred()
- reactor.spawnProcess(CapturingProcessProtocol(deferred, None), python, args, env=os.environ, path=cwd)
+ reactor.spawnProcess(CapturingProcessProtocol(deferred, None), cmd, args, env=os.environ, path=cwd)
output = yield deferred
returnValue(output)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140401/dd1c4788/attachment.html>
More information about the calendarserver-changes
mailing list