Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions mocket/mocket.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,9 @@ def makefile(self, mode='r', bufsize=-1):
def get_entry(self, data):
return Mocket.get_entry(self._host, self._port, data)

def sendall(self, data, *args, **kwargs):
entry = self.get_entry(data)
def sendall(self, data, entry=None, *args, **kwargs):
if entry is None:
entry = self.get_entry(data)

if entry:
entry.collect(data)
Expand Down Expand Up @@ -317,13 +318,14 @@ def true_sendall(self, data, *args, **kwargs):
def send(self, data, *args, **kwargs): # pragma: no cover
entry = self.get_entry(data)
if entry and self._entry != entry:
self.sendall(data, *args, **kwargs)
self.sendall(data, entry=entry, *args, **kwargs)
else:
req = Mocket.last_request()
if hasattr(req, 'add_data'):
req.add_data(decode_from_bytes(data))
self._entry = entry
return len(data)

# def __getattribute__(self, name):
# return super(MocketSocket, self).__getattribute__(name)

def __getattr__(self, name):
""" Useful when clients call methods on real
socket we do not provide on the fake one. """
Expand Down
4 changes: 2 additions & 2 deletions mocket/mockhttp.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ def __init__(self, data):
self.method = self.command
self.querystring = parse_qs(unquote_utf8(urlsplit(self.path).query), keep_blank_values=True)

def __str__(self):
return "{} - {} - {}".format(self.method, self.path, self.headers)
def add_data(self, data):
self.body += data

def __str__(self):
return "{} - {} - {}".format(self.method, self.path, self.headers)
Expand Down
3 changes: 2 additions & 1 deletion tests/tests35/test_http_aiohttp.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import async_timeout
from unittest import TestCase

from mocket.mocket import mocketize
from mocket.mocket import mocketize, Mocket
from mocket.mockhttp import Entry
from mocket.plugins.httpretty import HTTPretty, httprettified

Expand All @@ -29,6 +29,7 @@ async def main(l):
async with session.post(url, data=body * 6) as post_response:
assert post_response.status == 201
assert await post_response.text() == body * 2
assert Mocket.last_request().body == body * 6

loop = asyncio.get_event_loop()
loop.set_debug(True)
Expand Down