[CalendarServer-changes] [14906] CalendarServer/trunk/contrib/performance/loadtest/sim.py

[source_changes at macosforge.org]

Revision: 14906
          http://trac.calendarserver.org//changeset/14906
Author:   sredmond at apple.com
Date:     2015-06-22 18:09:10 -0700 (Mon, 22 Jun 2015)
Log Message:
-----------
Remove unused code from sim and simplify dictionary access

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/sim.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py	2015-06-23 00:01:18 UTC (rev 14905)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2015-06-23 01:09:10 UTC (rev 14906)
@@ -69,22 +69,6 @@
 
 
 
-def generateRecords(
-    count, uidPattern="user%d", passwordPattern="user%d",
-    namePattern="User %d", emailPattern="user%d at example.com",
-    guidPattern="user%d"
-):
-    for i in xrange(count):
-        i += 1
-        uid = uidPattern % (i,)
-        password = passwordPattern % (i,)
-        name = namePattern % (i,)
-        email = emailPattern % (i,)
-        guid = guidPattern % (i,)
-        yield _DirectoryRecord(uid, password, name, email, guid)
-
-
-
 def recordsFromCSVFile(path):
     if path:
         pathObj = FilePath(path)
@@ -97,20 +81,6 @@
 
 
 
-def recordsFromCount(count, uid=u"user%02d", password=u"user%02d",
-                     commonName=u"User %02d", email=u"user%02d at example.com",
-                     guid="10000000-0000-0000-0000-000000000%03d"):
-    for i in range(1, count + 1):
-        yield _DirectoryRecord(
-            uid % i,
-            password % i,
-            commonName % i,
-            email % i,
-            guid % i,
-        )
-
-
-
 class LagTrackingReactor(object):
     """
     This reactor wraps another reactor and proxies all attribute
@@ -292,16 +262,10 @@
             workerID = config.get("workerID", 0)
             workerCount = config.get("workerCount", 1)
             configTemplate = None
-            server = 'http://127.0.0.1:8008'
-            principalPathTemplate = "/principals/users/%s/"
+            server = config.get('server', 'http://127.0.0.1:8008')
+            principalPathTemplate = config.get('principalPathTemplate', '/principals/users/%s/')
             serializationPath = None
 
-            if 'server' in config:
-                server = config['server']
-
-            if 'principalPathTemplate' in config:
-                principalPathTemplate = config['principalPathTemplate']
-
             if 'clientDataSerialization' in config:
                 serializationPath = config['clientDataSerialization']['Path']
                 if not config['clientDataSerialization']['UseOldData']:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150622/1b2e1bb7/attachment-0001.html>