Merge pull request #7995 from freqtrade/dependabot/pip/develop/httpx-0.23.3
Bump httpx from 0.23.1 to 0.23.3
This commit is contained in:
		| @@ -20,7 +20,7 @@ isort==5.11.4 | ||||
| # For datetime mocking | ||||
| time-machine==2.9.0 | ||||
| # fastapi testing | ||||
| httpx==0.23.1 | ||||
| httpx==0.23.3 | ||||
|  | ||||
| # Convert jupyter notebooks to markdown documents | ||||
| nbconvert==7.2.7 | ||||
|   | ||||
| @@ -1,8 +1,6 @@ | ||||
| """ | ||||
| Unit test file for rpc/api_server.py | ||||
| """ | ||||
|  | ||||
| import json | ||||
| import logging | ||||
| import time | ||||
| from datetime import datetime, timedelta, timezone | ||||
| @@ -68,22 +66,23 @@ def botclient(default_conf, mocker): | ||||
|         ApiServer.shutdown() | ||||
|  | ||||
|  | ||||
| def client_post(client, url, data={}): | ||||
| def client_post(client: TestClient, url, data={}): | ||||
|  | ||||
|     return client.post(url, | ||||
|                        content=data, | ||||
|                        json=data, | ||||
|                        headers={'Authorization': _basic_auth_str(_TEST_USER, _TEST_PASS), | ||||
|                                 'Origin': 'http://example.com', | ||||
|                                 'content-type': 'application/json' | ||||
|                                 }) | ||||
|  | ||||
|  | ||||
| def client_get(client, url): | ||||
| def client_get(client: TestClient, url): | ||||
|     # Add fake Origin to ensure CORS kicks in | ||||
|     return client.get(url, headers={'Authorization': _basic_auth_str(_TEST_USER, _TEST_PASS), | ||||
|                                     'Origin': 'http://example.com'}) | ||||
|  | ||||
|  | ||||
| def client_delete(client, url): | ||||
| def client_delete(client: TestClient, url): | ||||
|     # Add fake Origin to ensure CORS kicks in | ||||
|     return client.delete(url, headers={'Authorization': _basic_auth_str(_TEST_USER, _TEST_PASS), | ||||
|                                        'Origin': 'http://example.com'}) | ||||
| @@ -561,7 +560,7 @@ def test_api_locks(botclient): | ||||
|     assert rc.json()['lock_count'] == 1 | ||||
|  | ||||
|     rc = client_post(client, f"{BASE_URI}/locks/delete", | ||||
|                      data='{"pair": "XRP/BTC"}') | ||||
|                      data={"pair": "XRP/BTC"}) | ||||
|     assert_response(rc) | ||||
|     assert rc.json()['lock_count'] == 0 | ||||
|  | ||||
| @@ -1062,7 +1061,7 @@ def test_api_blacklist(botclient, mocker): | ||||
|  | ||||
|     # Add ETH/BTC to blacklist | ||||
|     rc = client_post(client, f"{BASE_URI}/blacklist", | ||||
|                      data='{"blacklist": ["ETH/BTC"]}') | ||||
|                      data={"blacklist": ["ETH/BTC"]}) | ||||
|     assert_response(rc) | ||||
|     assert rc.json() == {"blacklist": ["DOGE/BTC", "HOT/BTC", "ETH/BTC"], | ||||
|                          "blacklist_expanded": ["ETH/BTC"], | ||||
| @@ -1072,7 +1071,7 @@ def test_api_blacklist(botclient, mocker): | ||||
|                          } | ||||
|  | ||||
|     rc = client_post(client, f"{BASE_URI}/blacklist", | ||||
|                      data='{"blacklist": ["XRP/.*"]}') | ||||
|                      data={"blacklist": ["XRP/.*"]}) | ||||
|     assert_response(rc) | ||||
|     assert rc.json() == {"blacklist": ["DOGE/BTC", "HOT/BTC", "ETH/BTC", "XRP/.*"], | ||||
|                          "blacklist_expanded": ["ETH/BTC", "XRP/BTC", "XRP/USDT"], | ||||
| @@ -1134,7 +1133,7 @@ def test_api_force_entry(botclient, mocker, fee, endpoint): | ||||
|     ftbot, client = botclient | ||||
|  | ||||
|     rc = client_post(client, f"{BASE_URI}/{endpoint}", | ||||
|                      data='{"pair": "ETH/BTC"}') | ||||
|                      data={"pair": "ETH/BTC"}) | ||||
|     assert_response(rc, 502) | ||||
|     assert rc.json() == {"error": f"Error querying /api/v1/{endpoint}: Force_entry not enabled."} | ||||
|  | ||||
| @@ -1144,7 +1143,7 @@ def test_api_force_entry(botclient, mocker, fee, endpoint): | ||||
|     fbuy_mock = MagicMock(return_value=None) | ||||
|     mocker.patch("freqtrade.rpc.RPC._rpc_force_entry", fbuy_mock) | ||||
|     rc = client_post(client, f"{BASE_URI}/{endpoint}", | ||||
|                      data='{"pair": "ETH/BTC"}') | ||||
|                      data={"pair": "ETH/BTC"}) | ||||
|     assert_response(rc) | ||||
|     assert rc.json() == {"status": "Error entering long trade for pair ETH/BTC."} | ||||
|  | ||||
| @@ -1171,7 +1170,7 @@ def test_api_force_entry(botclient, mocker, fee, endpoint): | ||||
|     mocker.patch("freqtrade.rpc.RPC._rpc_force_entry", fbuy_mock) | ||||
|  | ||||
|     rc = client_post(client, f"{BASE_URI}/{endpoint}", | ||||
|                      data='{"pair": "ETH/BTC"}') | ||||
|                      data={"pair": "ETH/BTC"}) | ||||
|     assert_response(rc) | ||||
|     assert rc.json() == { | ||||
|         'amount': 1.0, | ||||
| @@ -1246,7 +1245,7 @@ def test_api_forceexit(botclient, mocker, ticker, fee, markets): | ||||
|     patch_get_signal(ftbot) | ||||
|  | ||||
|     rc = client_post(client, f"{BASE_URI}/forceexit", | ||||
|                      data='{"tradeid": "1"}') | ||||
|                      data={"tradeid": "1"}) | ||||
|     assert_response(rc, 502) | ||||
|     assert rc.json() == {"error": "Error querying /api/v1/forceexit: invalid argument"} | ||||
|     Trade.query.session.rollback() | ||||
| @@ -1255,7 +1254,7 @@ def test_api_forceexit(botclient, mocker, ticker, fee, markets): | ||||
|     trade = Trade.get_trades([Trade.id == 5]).first() | ||||
|     assert pytest.approx(trade.amount) == 123 | ||||
|     rc = client_post(client, f"{BASE_URI}/forceexit", | ||||
|                      data='{"tradeid": "5", "ordertype": "market", "amount": 23}') | ||||
|                      data={"tradeid": "5", "ordertype": "market", "amount": 23}) | ||||
|     assert_response(rc) | ||||
|     assert rc.json() == {'result': 'Created sell order for trade 5.'} | ||||
|     Trade.query.session.rollback() | ||||
| @@ -1265,7 +1264,7 @@ def test_api_forceexit(botclient, mocker, ticker, fee, markets): | ||||
|     assert trade.is_open is True | ||||
|  | ||||
|     rc = client_post(client, f"{BASE_URI}/forceexit", | ||||
|                      data='{"tradeid": "5"}') | ||||
|                      data={"tradeid": "5"}) | ||||
|     assert_response(rc) | ||||
|     assert rc.json() == {'result': 'Created sell order for trade 5.'} | ||||
|     Trade.query.session.rollback() | ||||
| @@ -1616,7 +1615,7 @@ def test_api_backtesting(botclient, mocker, fee, caplog, tmpdir): | ||||
|         "dry_run_wallet": 1000, | ||||
|         "enable_protections": False | ||||
|     } | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=json.dumps(data)) | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=data) | ||||
|     assert_response(rc) | ||||
|     result = rc.json() | ||||
|  | ||||
| @@ -1667,7 +1666,7 @@ def test_api_backtesting(botclient, mocker, fee, caplog, tmpdir): | ||||
|     assert result['status'] == 'running' | ||||
|  | ||||
|     # Post to backtest that's still running | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=json.dumps(data)) | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=data) | ||||
|     assert_response(rc, 502) | ||||
|     result = rc.json() | ||||
|     assert 'Bot Background task already running' in result['error'] | ||||
| @@ -1675,7 +1674,7 @@ def test_api_backtesting(botclient, mocker, fee, caplog, tmpdir): | ||||
|     ApiServer._bgtask_running = False | ||||
|  | ||||
|     # Rerun backtest (should get previous result) | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=json.dumps(data)) | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=data) | ||||
|     assert_response(rc) | ||||
|     result = rc.json() | ||||
|     assert log_has_re('Reusing result of previous backtest.*', caplog) | ||||
| @@ -1684,7 +1683,7 @@ def test_api_backtesting(botclient, mocker, fee, caplog, tmpdir): | ||||
|  | ||||
|     mocker.patch('freqtrade.optimize.backtesting.Backtesting.backtest_one_strategy', | ||||
|                  side_effect=DependencyException()) | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=json.dumps(data)) | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=data) | ||||
|     assert log_has("Backtesting caused an error: ", caplog) | ||||
|  | ||||
|     # Delete backtesting to avoid leakage since the backtest-object may stick around. | ||||
| @@ -1698,7 +1697,7 @@ def test_api_backtesting(botclient, mocker, fee, caplog, tmpdir): | ||||
|  | ||||
|     # Disallow base64 strategies | ||||
|     data['strategy'] = "xx:cHJpbnQoImhlbGxvIHdvcmxkIik=" | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=json.dumps(data)) | ||||
|     rc = client_post(client, f"{BASE_URI}/backtest", data=data) | ||||
|     assert_response(rc, 500) | ||||
|  | ||||
|  | ||||
| @@ -1766,7 +1765,7 @@ def test_api_ws_subscribe(botclient, mocker): | ||||
|     assert sub_mock.call_count == 1 | ||||
|  | ||||
|  | ||||
| def test_api_ws_requests(botclient, mocker, caplog): | ||||
| def test_api_ws_requests(botclient, caplog): | ||||
|     caplog.set_level(logging.DEBUG) | ||||
|  | ||||
|     ftbot, client = botclient | ||||
|   | ||||
		Reference in New Issue
	
	Block a user