Commit 8e883ec09cfca95538eeb8e33f93d281983f8aed - aioftp

Update patch for 0.18.1 release Adam Cecile 3 years ago

1 changed file(s) with 12 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all

+12

-11

debian/patches/0002-Socks-proxy-unittest-optional-siosocks.patch less more

7	7	tests/test_client_side_socks.py \| 4 +++-
8	8	2 files changed, 8 insertions(+), 2 deletions(-)
9	9
10		diff --git a/tests/conftest.py b/tests/conftest.py
11		index f257b99..62ba002 100644
12		--- a/tests/conftest.py
13		+++ b/tests/conftest.py
	10	Index: aioftp/tests/conftest.py
	11	===================================================================
	12	--- aioftp.orig/tests/conftest.py
	13	+++ aioftp/tests/conftest.py
14	14	@@ -14,7 +14,11 @@ import trustme
15	15	from async_timeout import timeout
16	16

24	24
25	25
26	26	# No ssl tests since https://bugs.python.org/issue36098
27		diff --git a/tests/test_client_side_socks.py b/tests/test_client_side_socks.py
28		index 073b2f1..e1a4976 100644
29		--- a/tests/test_client_side_socks.py
30		+++ b/tests/test_client_side_socks.py
31		@@ -1,6 +1,7 @@
	27	Index: aioftp/tests/test_client_side_socks.py
	28	===================================================================
	29	--- aioftp.orig/tests/test_client_side_socks.py
	30	+++ aioftp/tests/test_client_side_socks.py
	31	@@ -1,7 +1,9 @@
32	32	import pytest
	33	from siosocks.exceptions import SocksException
33	34	+from conftest import HAS_SIOSOCKS
34	35
35		-
	36
36	37	+@pytest.mark.skipif(not HAS_SIOSOCKS, reason="requires siosocks package")
37	38	@pytest.mark.asyncio
38	39	async def test_socks_success(pair_factory, Client, socks):
39	40	client = Client(socks_host=socks.host, socks_port=socks.port,
40		@@ -9,6 +10,7 @@ async def test_socks_success(pair_factory, Client, socks):
	41	@@ -10,6 +12,7 @@ async def test_socks_success(pair_factor
41	42	pass
42	43
43	44