Skip to content

Commit

Permalink
Merge pull request #168 from MattBroach/master
Browse files Browse the repository at this point in the history
fix: broken test on python >= 3.8.1
  • Loading branch information
jaraco committed Jul 18, 2020
2 parents ad76e2a + bb0df65 commit a2e8405
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
2 changes: 0 additions & 2 deletions irc/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ class AioFactory:
"""

family = socket.AF_INET

def __init__(self, **kwargs):
self.connection_args = kwargs

Expand Down
23 changes: 12 additions & 11 deletions irc/tests/test_client_aio.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
from unittest.mock import patch, MagicMock
from unittest.mock import MagicMock
import asyncio

import pytest

from irc import client_aio


@pytest.mark.xfail('sys.version_info >= (3, 8, 1)')
@patch('asyncio.base_events.BaseEventLoop.create_connection')
def test_privmsg_sends_msg(create_connection_mock):
# create dummy transport, protocol
fake_connection = asyncio.Future()
def make_mocked_create_connection(mock_transport, mock_protocol):
async def mock_create_connection(*args, **kwargs):
return (mock_transport, mock_protocol)

return mock_create_connection


def test_privmsg_sends_msg():
# create dummy transport, protocol
mock_transport = MagicMock()
mock_protocol = MagicMock()

fake_connection.set_result((mock_transport, mock_protocol))
create_connection_mock.return_value = fake_connection

# connect to dummy server
loop = asyncio.get_event_loop()
loop.create_connection = make_mocked_create_connection(
mock_transport, mock_protocol
)
server = client_aio.AioReactor(loop=loop).server()
loop.run_until_complete(server.connect('foo', 6667, 'my_irc_nick'))
server.privmsg('#best-channel', 'You are great')
Expand Down
2 changes: 1 addition & 1 deletion scripts/irccat2-aio.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ async def send_it(self):
self.connection.privmsg(self.target, line)

# Allow pause in the stdin loop to not block asyncio loop
asyncio.sleep(0)
await asyncio.sleep(0)
self.connection.quit("Using irc.client.py")


Expand Down

0 comments on commit a2e8405

Please sign in to comment.