diff --git a/tests/test_compute_manager.py b/tests/test_compute_manager.py index ad484756..4ea4d21d 100644 --- a/tests/test_compute_manager.py +++ b/tests/test_compute_manager.py @@ -59,7 +59,7 @@ def test_deleteCompute(controller): cm.deleteCompute("test") assert "test" not in cm._computes assert callback_delete.called - controller._http_client.createHTTPQuery.assert_called_with("DELETE", "/computes/test", None) + controller._http_client.createHTTPQuery.assert_called_with("DELETE", "/computes/test") def test_listComputesCallback(): diff --git a/tests/test_http_client.py b/tests/test_http_client.py index 79006466..6a45687d 100644 --- a/tests/test_http_client.py +++ b/tests/test_http_client.py @@ -66,7 +66,6 @@ def test_get_connected(http_client, http_request, network_manager, response): http_client.createHTTPQuery("GET", "/test", callback) http_request.assert_called_with(QtCore.QUrl("http://127.0.0.1:3080/v2/test")) - http_request.setRawHeader.assert_any_call(b"Content-Type", b"application/json") http_request.setRawHeader.assert_any_call(b"User-Agent", "GNS3 QT Client v{version}".format(version=__version__).encode()) assert network_manager.sendCustomRequest.called args, kwargs = network_manager.sendCustomRequest.call_args @@ -80,7 +79,7 @@ def test_get_connected(http_client, http_request, network_manager, response): def test_paramsToQueryString(http_client): - assert http_client._paramsToQueryString({}) == "" + assert http_client._paramsToQueryString(None) == "" res = http_client._paramsToQueryString({"a": 1, "b": 2}) assert res == "?a=1&b=2" or res == "?b=2&a=1" res = http_client._paramsToQueryString({"a": 1, "b": 2, "c": None}) @@ -96,7 +95,6 @@ def test_get_connected_auth(http_client, http_request, network_manager, response http_client.createHTTPQuery("GET", "/test", callback) http_request.assert_called_with(QtCore.QUrl("http://gns3@127.0.0.1:3080/v2/test")) - http_request.setRawHeader.assert_any_call(b"Content-Type", b"application/json") http_request.setRawHeader.assert_any_call(b"Authorization", b"Basic Z25zMzozc25n") http_request.setRawHeader.assert_any_call(b"User-Agent", "GNS3 QT Client v{version}".format(version=__version__).encode()) assert network_manager.sendCustomRequest.called @@ -115,7 +113,7 @@ def test_post_not_connected(http_client, http_request, network_manager, response http_client._connected = False callback = unittest.mock.MagicMock() - http_client.createHTTPQuery("POST", "/test", callback, context={"toto": 42}) + http_client.createHTTPQuery("POST", "/test", callback, context={"query_id": 42}) args, kwargs = network_manager.sendCustomRequest.call_args assert args[0] == http_request @@ -138,7 +136,7 @@ def test_post_not_connected(http_client, http_request, network_manager, response assert callback.called args, kwargs = callback.call_args - assert kwargs["context"]["toto"] == 42 + assert kwargs["context"]["query_id"] == 42 def test_post_not_connected_connection_failed(http_client, http_request, network_manager, response): diff --git a/tests/test_link.py b/tests/test_link.py index b571c9ef..d2e4a7cd 100644 --- a/tests/test_link.py +++ b/tests/test_link.py @@ -65,7 +65,7 @@ def link(devices, controller, project): {"node_id": devices[0].node_id(), "adapter_number": 0, "port_number": 0}, {"node_id": devices[1].node_id(), "adapter_number": 0, "port_number": 0} ], - "link_style": {}, + "link_style": {'color': '#000000', 'width': 2, 'type': 1}, "filters": {}, } @@ -90,7 +90,7 @@ def test_create_link(devices, project, controller): {"node_id": devices[0].node_id(), "adapter_number": 0, "port_number": 0}, {"node_id": devices[1].node_id(), "adapter_number": 0, "port_number": 0}, ], - "link_style": {}, + "link_style": {'color': '#000000', 'width': 2, 'type': 1}, "filters": {}, }