[CalendarServer-changes] [14400] CalDAVTester/trunk/cdtdiagnose.py

[source_changes at macosforge.org]

Revision: 14400
          http://trac.calendarserver.org//changeset/14400
Author:   dre at apple.com
Date:     2015-02-10 13:54:08 -0800 (Tue, 10 Feb 2015)
Log Message:
-----------
Add option for archive destination directory

Modified Paths:
--------------
    CalDAVTester/trunk/cdtdiagnose.py

Modified: CalDAVTester/trunk/cdtdiagnose.py
===================================================================
--- CalDAVTester/trunk/cdtdiagnose.py	2015-02-10 21:51:43 UTC (rev 14399)
+++ CalDAVTester/trunk/cdtdiagnose.py	2015-02-10 21:54:08 UTC (rev 14400)
@@ -20,6 +20,7 @@
 import datetime
 import shutil
 import sys
+import argparse
 from subprocess import Popen, PIPE
 
 server_root = "/Applications/Server.app/Contents/ServerRoot"
@@ -45,6 +46,13 @@
 
 if __name__ == "__main__":
 
+    parser = argparse.ArgumentParser(
+        description='Gather CalDAVTester diagnostics.',
+    )
+    parser.add_argument('-d', '--directory', action='store',
+              help='Destination directory for diagnostics archive')
+    args = parser.parse_args()
+
     print "Running CDT diagnostics due to test failure."
     log = []
 
@@ -57,6 +65,14 @@
     now = datetime.datetime.now()
     now = now.replace(microsecond=0)
     dirname = "cdtdiagnose-%s" % (now.strftime("%Y%m%d-%H%M%S"),)
+
+    if args.directory is not None:
+        if not os.path.isdir(args.directory):
+            print "Specified target directory path is invalid, using default."
+        else:
+            dirname = os.path.join(args.directory, dirname)
+
+    print "Saving diagnostic archive to: {}".format(dirname,)
     try:
         os.mkdir(dirname)
     except Exception as e:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150210/1d11f76b/attachment.html>