Revision 0351944b
b/lib/rapi/testutils.py | ||
---|---|---|
187 | 187 |
"%s %s" % (http.auth.HTTP_BASIC_AUTH, base64.b64encode(userpwd)) |
188 | 188 |
|
189 | 189 |
path = _GetPathFromUri(url) |
190 |
(code, resp_body) = \ |
|
190 |
(code, _, resp_body) = \
|
|
191 | 191 |
self._handler.FetchResponse(path, method, headers, request_body) |
192 | 192 |
|
193 | 193 |
self._info[pycurl.RESPONSE_CODE] = code |
... | ... | |
223 | 223 |
@param request_body: Request body |
224 | 224 |
@type headers: mimetools.Message |
225 | 225 |
@param headers: Request headers |
226 |
@return: Tuple containing status code and response body |
|
226 |
@return: Tuple containing status code, response headers and response body
|
|
227 | 227 |
|
228 | 228 |
""" |
229 | 229 |
req_msg = http.HttpMessage() |
... | ... | |
235 | 235 |
(_, _, _, resp_msg) = \ |
236 | 236 |
http.server.HttpResponder(self.handler)(lambda: (req_msg, None)) |
237 | 237 |
|
238 |
return (resp_msg.start_line.code, resp_msg.body) |
|
238 |
return (resp_msg.start_line.code, resp_msg.headers, resp_msg.body)
|
|
239 | 239 |
|
240 | 240 |
|
241 | 241 |
class _TestLuxiTransport: |
b/test/ganeti.rapi.client_unittest.py | ||
---|---|---|
96 | 96 |
|
97 | 97 |
(code, response) = self._responses.pop() |
98 | 98 |
|
99 |
return code, response
|
|
99 |
return (code, NotImplemented, response)
|
|
100 | 100 |
|
101 | 101 |
|
102 | 102 |
class TestConstants(unittest.TestCase): |
... | ... | |
136 | 136 |
|
137 | 137 |
|
138 | 138 |
class RapiMockTest(unittest.TestCase): |
139 |
def test(self): |
|
139 |
def test404(self): |
|
140 |
(code, _, body) = RapiMock().FetchResponse("/foo", "GET", None, None) |
|
141 |
self.assertEqual(code, 404) |
|
142 |
self.assertTrue(body is None) |
|
143 |
|
|
144 |
def test501(self): |
|
145 |
(code, _, body) = RapiMock().FetchResponse("/version", "POST", None, None) |
|
146 |
self.assertEqual(code, 501) |
|
147 |
self.assertEqual(body, "Method not implemented") |
|
148 |
|
|
149 |
def test200(self): |
|
140 | 150 |
rapi = RapiMock() |
141 |
path = "/version" |
|
142 |
self.assertEqual((404, None), rapi.FetchResponse("/foo", "GET", None, None)) |
|
143 |
self.assertEqual((501, "Method not implemented"), |
|
144 |
rapi.FetchResponse("/version", "POST", None, None)) |
|
145 | 151 |
rapi.AddResponse("2") |
146 |
code, response = rapi.FetchResponse("/version", "GET", None, None)
|
|
152 |
(code, _, response) = rapi.FetchResponse("/version", "GET", None, None)
|
|
147 | 153 |
self.assertEqual(200, code) |
148 | 154 |
self.assertEqual("2", response) |
149 | 155 |
self.failUnless(isinstance(rapi.GetLastHandler(), rlib2.R_version)) |
Also available in: Unified diff