Changeset 1444 for pyamf/branches/client-headers/pyamf/tests

Timestamp:

06/20/08 20:45:18 (7 months ago)

Author:

thijs

Message:

Adding branch for tickets #306, #316, #317

Location:

pyamf/branches/client-headers

Files:

• . (copied) (copied from pyamf/trunk)
• pyamf/tests/gateway/test_wsgi.py (modified) (1 diff)
• pyamf/tests/remoting/test_client.py (modified) (9 diffs)

pyamf/branches/client-headers/pyamf/tests/gateway/test_wsgi.py

@@ -65 +65 @@
         def start_response(status, headers):
             self.assertEquals(status, '200 OK')
-            self.assertTrue(('Content-Type', 'application/x-amf') in headers)
+            self.assertTrue(('Content-Type', remoting.CONTENT_TYPE) in headers)
 
         response = gw(env, start_response)

pyamf/branches/client-headers/pyamf/tests/remoting/test_client.py

@@ -371 +371 @@
 
         dc.tc = self
-        dc.expected_headers = {'Content-Type': 'application/x-amf'}
+        dc.expected_headers = {'Content-Type': remoting.CONTENT_TYPE,
+                               'User-Agent': client.DEFAULT_USER_AGENT,
+                               'Referer': client.DEFAULT_REFERER}
 
         service = gw.getService('baz', auto_execute=False)
@@ -378 +380 @@
         response = DummyResponse(200, '\x00\x00\x00\x00\x00\x01\x00\x0b/1/onRe'
             'sult\x00\x04null\x00\x00\x00\x00\x00\x02\x00\x05hello', {
-            'Content-Type': 'application/x-amf', 'Content-Length': 50})
+            'Content-Type': remoting.CONTENT_TYPE, 'Content-Length': 50})
         response.tc = self
 
@@ -393 +395 @@
         response = DummyResponse(200, '\x00\x00\x00\x00\x00\x01\x00\x0b/2/onRe'
             'sult\x00\x04null\x00\x00\x00\x00\x00\x02\x00\x05hello', {
-            'Content-Type': 'application/x-amf'})
+            'Content-Type': remoting.CONTENT_TYPE})
         response.tc = self
 
@@ -409 +411 @@
 
         dc.tc = self
-        dc.expected_headers = {'Content-Type': 'application/x-amf'}
+        dc.expected_headers = {'Content-Type': remoting.CONTENT_TYPE,
+                               'User-Agent': client.DEFAULT_USER_AGENT,
+                               'Referer': client.DEFAULT_REFERER}
 
         baz = gw.getService('baz', auto_execute=False)
@@ -419 +423 @@
             'sult\x00\x04null\x00\x00\x00\x00\x00\x02\x00\x05hello\x00\x0b/2/o'
             'nResult\x00\x04null\x00\x00\x00\x00\x00\x02\x00\x05hello', {
-                'Content-Type': 'application/x-amf'})
+                'Content-Type': remoting.CONTENT_TYPE})
         response.tc = self
 
@@ -437 +441 @@
 
         response = DummyResponse(200, '\x00\x00\x00\x00\x00\x00', {
-            'Content-Type': 'application/x-amf'})
+            'Content-Type': remoting.CONTENT_TYPE})
 
         dc.response = response
@@ -478 +482 @@
         response = DummyResponse(200, '\x00\x00\x00\x01\x00\x12AppendToGatewayUrl'
             '\x01\x00\x00\x00\x00\x02\x00\x05hello\x00\x00', {
-            'Content-Type': 'application/x-amf'})
+            'Content-Type': remoting.CONTENT_TYPE})
 
         dc.response = response
@@ -492 +496 @@
         response = DummyResponse(200, '\x00\x00\x00\x01\x00\x11ReplaceGatewayUrl'
             '\x01\x00\x00\x00\x00\x02\x00\x10http://spam.eggs\x00\x00', {
-            'Content-Type': 'application/x-amf'})
+            'Content-Type': remoting.CONTENT_TYPE})
 
         dc.response = response
@@ -505 +509 @@
         dc.response = DummyResponse(200, '\x00\x00\x00\x01\x00\x11ReplaceGatewayUrl'
             '\x01\x00\x00\x00\x00\x02\x00\x10http://spam.eggs\x00\x00', {
-            'Content-Type': 'application/x-amf'})
+            'Content-Type': remoting.CONTENT_TYPE})
 
         gw._getResponse()