[CalendarServer-changes] [13470] CalendarServer/trunk/calendarserver/tools/test
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 14 09:11:49 PDT 2014
Revision: 13470
http://trac.calendarserver.org//changeset/13470
Author: sagen at apple.com
Date: 2014-05-14 09:11:49 -0700 (Wed, 14 May 2014)
Log Message:
-----------
Rely on PATH to find the calendarserver_* scripts during tests
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
CalendarServer/trunk/calendarserver/tools/test/test_principals.py
Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2014-05-13 20:55:17 UTC (rev 13469)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2014-05-14 16:11:49 UTC (rev 13470)
@@ -157,7 +157,7 @@
sourceRoot = os.path.dirname(
os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
)
- cmd = os.path.join(sourceRoot, "bin", script)
+ cmd = script # assumes it's on PATH
args = [cmd, "-f", self.configFileName]
if error:
Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-05-13 20:55:17 UTC (rev 13469)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-05-14 16:11:49 UTC (rev 13470)
@@ -101,7 +101,7 @@
Run calendarserver_manage_principals, passing additional as args.
"""
sourceRoot = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
- cmd = os.path.join(sourceRoot, "bin", "calendarserver_manage_principals")
+ cmd = "calendarserver_manage_principals" # assumes it's on PATH
args = [cmd, "-f", self.configFileName]
args.extend(additional)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140514/c89c0e29/attachment-0001.html>
More information about the calendarserver-changes
mailing list