[CalendarServer-changes] [15609] CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py

[source_changes at macosforge.org]

Revision: 15609
          http://trac.calendarserver.org//changeset/15609
Author:   cdaboo at apple.com
Date:     2016-05-19 09:19:55 -0700 (Thu, 19 May 2016)
Log Message:
-----------
Fix tests after changes to reverse proxy.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py

Modified: CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py	2016-05-19 16:07:38 UTC (rev 15608)
+++ CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py	2016-05-19 16:19:55 UTC (rev 15609)
@@ -21,6 +21,7 @@
 from twistedcaldav.client.reverseproxy import ReverseProxyResource
 from twistedcaldav.config import config
 import twistedcaldav.test.util
+from twisted.internet.defer import succeed, inlineCallbacks
 
 class ReverseProxyNoLoop (twistedcaldav.test.util.TestCase):
     """
@@ -32,50 +33,60 @@
         class DummyPool(object):
 
             def submitRequest(self, request):
-                return request
+                return succeed(request)
 
         _clientPools["pool"] = DummyPool()
 
         super(ReverseProxyNoLoop, self).setUp()
 
 
+    @inlineCallbacks
     def test_No_Header(self):
         proxy = ReverseProxyResource("pool")
         request = SimpleRequest(proxy, "GET", "/")
-        self.assertIsInstance(proxy.renderHTTP(request), ClientRequest)
+        response = yield proxy.renderHTTP(request)
+        self.assertIsInstance(response, ClientRequest)
 
 
+    @inlineCallbacks
     def test_Header_Other_Server(self):
         proxy = ReverseProxyResource("pool")
         request = SimpleRequest(proxy, "GET", "/")
         request.headers.addRawHeader("x-forwarded-server", "foobar.example.com")
-        self.assertIsInstance(proxy.renderHTTP(request), ClientRequest)
+        response = yield proxy.renderHTTP(request)
+        self.assertIsInstance(response, ClientRequest)
 
 
+    @inlineCallbacks
     def test_Header_Other_Servers(self):
         proxy = ReverseProxyResource("pool")
         request = SimpleRequest(proxy, "GET", "/")
         request.headers.setHeader("x-forwarded-server", ("foobar.example.com", "bar.example.com",))
-        self.assertIsInstance(proxy.renderHTTP(request), ClientRequest)
+        response = yield proxy.renderHTTP(request)
+        self.assertIsInstance(response, ClientRequest)
 
 
+    @inlineCallbacks
     def test_Header_Our_Server(self):
         proxy = ReverseProxyResource("pool")
         request = SimpleRequest(proxy, "GET", "/")
         request.headers.addRawHeader("x-forwarded-server", config.ServerHostName)
-        self.assertRaises(HTTPError, proxy.renderHTTP, request)
+        yield self.assertFailure(proxy.renderHTTP(request), HTTPError)
 
 
+    @inlineCallbacks
     def test_Header_Our_Server_Moxied(self):
         proxy = ReverseProxyResource("pool")
         request = SimpleRequest(proxy, "GET", "/")
         request.headers.setHeader("x-forwarded-server", ("foobar.example.com", "bar.example.com", config.ServerHostName,))
-        self.assertRaises(HTTPError, proxy.renderHTTP, request)
+        yield self.assertFailure(proxy.renderHTTP(request), HTTPError)
 
 
+    @inlineCallbacks
     def test_Header_Our_Server_Allowed(self):
         proxy = ReverseProxyResource("pool")
         proxy.allowMultiHop = True
         request = SimpleRequest(proxy, "GET", "/")
         request.headers.addRawHeader("x-forwarded-server", config.ServerHostName)
-        self.assertIsInstance(proxy.renderHTTP(request), ClientRequest)
+        response = yield proxy.renderHTTP(request)
+        self.assertIsInstance(response, ClientRequest)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160519/c0d5dc4a/attachment.html>