[CalendarServer-changes] [15574] CalendarServer/trunk/contrib/performance/loadtest/test_ical.py

[source_changes at macosforge.org]

Revision: 15574
          http://trac.calendarserver.org//changeset/15574
Author:   sagen at apple.com
Date:     2016-05-05 11:57:59 -0700 (Thu, 05 May 2016)
Log Message:
-----------
Update tests to deal with the fixes to etag retrieval

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

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2016-05-05 17:12:41 UTC (rev 15573)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2016-05-05 18:57:59 UTC (rev 15574)
@@ -27,7 +27,7 @@
 from pycalendar.datetime import DateTime
 from pycalendar.timezone import Timezone
 
-from twisted.internet.defer import Deferred, inlineCallbacks, returnValue
+from twisted.internet.defer import Deferred, inlineCallbacks, returnValue, succeed
 from twisted.internet.protocol import ProtocolToConsumerAdapter
 from twisted.python.failure import Failure
 from twisted.trial.unittest import TestCase
@@ -1356,7 +1356,7 @@
 
         def requested(ignored):
             response = MemoryResponse(
-                ('HTTP', '1', '1'), CREATED, "Created", Headers({}),
+                ('HTTP', '1', '1'), CREATED, "Created", Headers({"etag": ["foo"]}),
                 StringProducer(""))
             result.callback(response)
         finished.addCallback(requested)
@@ -1447,8 +1447,21 @@
 
             returnValue(response)
 
-        requests = [_testReport, _testPost02, _testReport, _testPost03, _testPut, ]
+        def _testGet(*args, **kwargs):
+            expectedResponseCode, method, url = args
+            self.assertEqual(expectedResponseCode, OK)
+            self.assertEqual(method, 'GET')
+            self.assertEqual(url, 'http://127.0.0.1/mumble/frotz.ics')
+            self.assertIsInstance(url, str)
 
+            response = MemoryResponse(
+                ('HTTP', '1', '1'), OK, "OK", Headers({"etag": ["foo"]}),
+                StringProducer(EVENT_INVITE))
+
+            return succeed(response)
+
+        requests = [_testReport, _testPost02, _testReport, _testPost03, _testPut, _testGet]
+
         def _requestHandler(*args, **kwargs):
             handler = requests.pop(0)
             return handler(*args, **kwargs)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160505/7d604721/attachment-0001.html>