From 8fe19d54efb22c85e4e1911a8fe37be444ef1a19 Mon Sep 17 00:00:00 2001 From: czaky Date: Fri, 17 May 2024 12:04:00 +0000 Subject: [PATCH] Using conservative unittest asserts --- tests/unit/network/test_client.py | 46 +++++++++++++++--------------- tests/unit/network/test_network.py | 30 +++++++++++-------- 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/tests/unit/network/test_client.py b/tests/unit/network/test_client.py index a37ce4400..5fa08187e 100644 --- a/tests/unit/network/test_client.py +++ b/tests/unit/network/test_client.py @@ -14,19 +14,19 @@ class TestClient(SearxTestCase): def test_get_single_transport(self): t = client.get_single_transport(proxy_url="socks4://local:1080") - assert isinstance(t, client.AsyncProxyTransportFixed) + self.assertTrue(isinstance(t, client.AsyncProxyTransportFixed)) t = client.get_single_transport(proxy_url="socks5://local:1080") - assert isinstance(t, client.AsyncProxyTransportFixed) + self.assertTrue(isinstance(t, client.AsyncProxyTransportFixed)) t = client.get_single_transport(proxy_url="socks5h://local:1080") - assert isinstance(t, client.AsyncProxyTransportFixed) + self.assertTrue(isinstance(t, client.AsyncProxyTransportFixed)) t = client.get_single_transport(proxy_url="https://local:8080") - assert isinstance(t, httpx.AsyncHTTPTransport) + self.assertTrue(isinstance(t, httpx.AsyncHTTPTransport)) def test_get_parallel_transport(self): t = client.get_transport( proxy_urls=["socks5h://local:1080", "socks5h://local:1180"], ) - assert isinstance(t, client.AsyncParallelTransport) + self.assertTrue(isinstance(t, client.AsyncParallelTransport)) @patch( 'searx.network.client.AsyncProxyTransportFixed.handle_async_request', @@ -38,12 +38,12 @@ class TestClient(SearxTestCase): ) request = httpx.Request(url="http://wiki.com", method="GET") response = await t.handle_async_request(request) - assert response.status_code == 200 + self.assertEqual(response.status_code, 200) handler_mock.assert_called_once_with(request) response = await t.handle_async_request(request) - assert response.status_code == 301 - assert handler_mock.call_count == 2 + self.assertEqual(handler_mock.call_count, 2) + self.assertEqual(response.status_code, 301) @patch( 'searx.network.client.AsyncProxyTransportFixed.handle_async_request', @@ -54,12 +54,12 @@ class TestClient(SearxTestCase): proxy_urls=["socks5h://local:1080", "socks5h://local:1180"], proxy_request_redundancy=2, ) - assert isinstance(t, client.AsyncParallelTransport) + self.assertTrue(isinstance(t, client.AsyncParallelTransport)) request = httpx.Request(url="http://wiki.com", method="GET") response = await t.handle_async_request(request) handler_mock.assert_called_with(request) - assert response.status_code == 200 - assert handler_mock.call_count == 2 + self.assertEqual(handler_mock.call_count, 2) + self.assertEqual(response.status_code, 200) @patch( 'searx.network.client.AsyncProxyTransportFixed.handle_async_request', @@ -70,12 +70,12 @@ class TestClient(SearxTestCase): proxy_urls=["socks5h://local:1080", "socks5h://local:1180"], proxy_request_redundancy=2, ) - assert isinstance(t, client.AsyncParallelTransport) + self.assertTrue(isinstance(t, client.AsyncParallelTransport)) request = httpx.Request(url="http://wiki.com", method="GET") response = await t.handle_async_request(request) handler_mock.assert_called_with(request) - assert response.status_code == 404 - assert handler_mock.call_count == 2 + self.assertEqual(handler_mock.call_count, 2) + self.assertEqual(response.status_code, 404) @patch( 'searx.network.client.AsyncProxyTransportFixed.handle_async_request', @@ -86,12 +86,12 @@ class TestClient(SearxTestCase): proxy_urls=["socks5h://local:1080", "socks5h://local:1180"], proxy_request_redundancy=2, ) - assert isinstance(t, client.AsyncParallelTransport) + self.assertTrue(isinstance(t, client.AsyncParallelTransport)) request = httpx.Request(url="http://wiki.com", method="GET") response = await t.handle_async_request(request) handler_mock.assert_called_with(request) - assert response.status_code == 403 - assert handler_mock.call_count == 2 + self.assertEqual(handler_mock.call_count, 2) + self.assertEqual(response.status_code, 403) @patch( 'searx.network.client.AsyncProxyTransportFixed.handle_async_request', @@ -102,12 +102,12 @@ class TestClient(SearxTestCase): proxy_urls=["socks5h://local:1080", "socks5h://local:1180"], proxy_request_redundancy=2, ) - assert isinstance(t, client.AsyncParallelTransport) + self.assertTrue(isinstance(t, client.AsyncParallelTransport)) request = httpx.Request(url="http://wiki.com", method="GET") response = await t.handle_async_request(request) handler_mock.assert_called_with(request) - assert response.status_code == 200 - assert handler_mock.call_count == 2 + self.assertEqual(response.status_code, 200) + self.assertEqual(handler_mock.call_count, 2) @patch( 'searx.network.client.AsyncProxyTransportFixed.handle_async_request', @@ -118,11 +118,11 @@ class TestClient(SearxTestCase): proxy_urls=["socks5h://local:1080", "socks5h://local:1180"], proxy_request_redundancy=2, ) - assert isinstance(t, client.AsyncParallelTransport) + self.assertTrue(isinstance(t, client.AsyncParallelTransport)) request = httpx.Request(url="http://wiki.com", method="GET") response = None with self.assertRaises(httpx.RequestError): response = await t.handle_async_request(request) handler_mock.assert_called_with(request) - assert not response - assert handler_mock.call_count == 2 + self.assertFalse(response) + self.assertEqual(handler_mock.call_count, 2) diff --git a/tests/unit/network/test_network.py b/tests/unit/network/test_network.py index c5312491c..f44408c67 100644 --- a/tests/unit/network/test_network.py +++ b/tests/unit/network/test_network.py @@ -49,24 +49,30 @@ class TestNetwork(SearxTestCase): # pylint: disable=missing-class-docstring def test_proxies_by_patterns(self): network = Network(proxies='http://localhost:1337') - assert network._proxies_by_pattern == {'all://': ('http://localhost:1337',)} + self.assertEqual(network._proxies_by_pattern, {'all://': ('http://localhost:1337',)}) network = Network(proxies={'https': 'http://localhost:1337', 'http': 'http://localhost:1338'}) - assert network._proxies_by_pattern == { - 'https://': ('http://localhost:1337',), - 'http://': ('http://localhost:1338',), - } + self.assertEqual( + network._proxies_by_pattern, + { + 'https://': ('http://localhost:1337',), + 'http://': ('http://localhost:1338',), + }, + ) network = Network( proxies={'https': ['http://localhost:1337', 'http://localhost:1339'], 'http': 'http://localhost:1338'} ) - assert network._proxies_by_pattern == { - 'https://': ( - 'http://localhost:1337', - 'http://localhost:1339', - ), - 'http://': ('http://localhost:1338',), - } + self.assertEqual( + network._proxies_by_pattern, + { + 'https://': ( + 'http://localhost:1337', + 'http://localhost:1339', + ), + 'http://': ('http://localhost:1338',), + }, + ) with self.assertRaises(ValueError): Network(proxies=1)