Description Daniel Engberg 2020-08-15 22:21:00 UTC

Created attachment 217245 [details]
Patch for urllib3

Update (py-)urllib3 to 1.25.10
Fix "make test"

Tested on FreeBSD 13.0-CURRENT #0 r358620 (AMD64) (make test)
Poudriere OK 12.1-RELEASE (AMD64)

1.25.7 (fixed make test)

test/contrib/test_socks.py::TestSocks5Proxy::test_socks_with_invalid_password FAILED
test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_cross_protocol_redirect FAILED

=== 2 failed, 1139 passed, 175 skipped, 1 deselected, 129 warnings in 67.67 seconds ===

1.25.10

test/contrib/test_socks.py::TestSocks5Proxy::test_socks_with_invalid_password FAILED

=== 1 failed, 1159 passed, 195 skipped, 3 deselected, 47 warnings in 36.02 seconds ===

Full log:

___ TestSocks5Proxy.test_socks_with_invalid_password ___

self = <test.contrib.test_socks.TestSocks5Proxy object at 0x8036f4210>

    def test_socks_with_invalid_password(self):
        def request_handler(listener):
            sock = listener.accept()[0]

            handler = handle_socks5_negotiation(
                sock, negotiate=True, username=b"user", password=b"pass"
            )
            next(handler)

        self._start_server(request_handler)
        proxy_url = "socks5h://%s:%s" % (self.host, self.port)
        with socks.SOCKSProxyManager(
            proxy_url, username="user", password="badpass"
        ) as pm:
            with pytest.raises(NewConnectionError) as e:
                pm.request("GET", "http://example.com", retries=False)
>           assert "SOCKS5 authentication failed" in str(e.value)
E           AssertionError: assert 'SOCKS5 authentication failed' in '<urllib3.contrib.socks.SOCKSConnection object at 0x80460a4d0>: Failed to establish a new connection: [Errno 61] Connection refused'
E            +  where '<urllib3.contrib.socks.SOCKSConnection object at 0x80460a4d0>: Failed to establish a new connection: [Errno 61] Connection refused' = str(NewConnectionError('<urllib3.contrib.socks.SOCKSConnection object at 0x80460a4d0>: Failed to establish a new connection: [Errno 61] Connection refused'))
E            +    where NewConnectionError('<urllib3.contrib.socks.SOCKSConnection object at 0x80460a4d0>: Failed to establish a new connection: [Errno 61] Connection refused') = <ExceptionInfo NewConnectionError tblen=16>.value

test/contrib/test_socks.py:448: AssertionError