[CalendarServer-changes] [1816] CalDAVTester/trunk/fsusage.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Aug 21 08:15:49 PDT 2007


Revision: 1816
          http://trac.macosforge.org/projects/calendarserver/changeset/1816
Author:   cdaboo at apple.com
Date:     2007-08-21 08:15:48 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
Enable the propfinds. Add a delay after starting fs_usage as it needs a little time to start up.

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

Modified: CalDAVTester/trunk/fsusage.py
===================================================================
--- CalDAVTester/trunk/fsusage.py	2007-08-21 15:14:31 UTC (rev 1815)
+++ CalDAVTester/trunk/fsusage.py	2007-08-21 15:15:48 UTC (rev 1816)
@@ -21,13 +21,13 @@
 # Generates fs_usage counts for CalDAVTester script runs.
 #
 
-import subprocess
-
 from src.manager import manager
 import getopt
 import os
 import signal
+import subprocess
 import sys
+import time
 
 def usage():
     print """Usage: fsusage [options]
@@ -39,8 +39,10 @@
 def getFSUsage(count, testscript, runs, pid, sname):
     tmpfile = "temp.fsusage.%02d" % (count,)
     fd = open(tmpfile, "w")
-    cid = subprocess.Popen(["fs_usage", "-f", "filesys", "%s" %(pid,),], stdout=fd).pid
+    cid = subprocess.Popen(["fs_usage", "-f", "filesys", "%s" %(pid,),], stdout=fd, stderr=fd).pid
     
+    time.sleep(5)
+    
     pname = None
     fnames = [testscript]
 
@@ -82,13 +84,14 @@
     fd = None
     
     tests = (
+        ("performance/put/put-small.xml", 10, "put-small",),
+        ("performance/put/put-large.xml", 10, "put-large",),
         ("performance/get/get-small.xml", 10, "get-small",),
         ("performance/get/get-large.xml", 10, "get-large",),
-        ("performance/put/put-small.xml", 10, "put-small",),
-        ("performance/put/put-large.xml", 10, "put-large",),
-        #("performance/propfind/propfind-small.xml", 10, "propfind-small",),
-        #("performance/propfind/propfind-medium.xml", 10, "propfind-medium",),
-        #("performance/propfind/propfind-large.xml", 10, "propfind-large",),
+        ("performance/propfind/propfind-ctag.xml", 10, "propfind-ctag",),
+        ("performance/propfind/propfind-small.xml", 10, "propfind-small",),
+        ("performance/propfind/propfind-medium.xml", 10, "propfind-medium",),
+        ("performance/propfind/propfind-large.xml", 10, "propfind-large",),
     )
     
     result = []

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070821/28480db2/attachment.html


More information about the calendarserver-changes mailing list