diff --git a/tests/compute/iou/test_iou_vm.py b/tests/compute/iou/test_iou_vm.py index 29efd5c3..24cf8bb7 100644 --- a/tests/compute/iou/test_iou_vm.py +++ b/tests/compute/iou/test_iou_vm.py @@ -439,7 +439,7 @@ def test_application_id(project, manager): """ Checks if uses local manager to get application_id when not set """ - vm = IOUVM("test", str(uuid.uuid4()), project, manager) + vm = IOUVM("test", str(uuid.uuid4()), project, manager, application_id=1) assert vm.application_id == 1 vm.application_id = 3 diff --git a/tests/compute/iou/utils/test_application_id.py b/tests/compute/iou/utils/test_application_id.py deleted file mode 100644 index e7302c5c..00000000 --- a/tests/compute/iou/utils/test_application_id.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2017 GNS3 Technologies Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import pytest -from unittest.mock import MagicMock -from gns3server.compute.iou.utils.application_id import get_next_application_id, IOUError - - -def test_get_next_application_id(): - # test first node - assert get_next_application_id([]) == 1 - - # test second node - nodes = [ - MagicMock(node_type='different'), - MagicMock(node_type='iou', properties=dict(application_id=1)) - ] - assert get_next_application_id(nodes) == 2 - - # test reach out the limit - nodes = [MagicMock(node_type='iou', properties=dict(application_id=i)) for i in range(1, 512)] - - with pytest.raises(IOUError): - get_next_application_id(nodes) diff --git a/tests/controller/test_project.py b/tests/controller/test_project.py index af8b3079..deb61b16 100644 --- a/tests/controller/test_project.py +++ b/tests/controller/test_project.py @@ -605,27 +605,6 @@ def test_node_name(project, async_run): assert node.name == "R3" -def test_add_iou_node_and_check_if_gets_application_id(project, async_run): - compute = MagicMock() - compute.id = "local" - response = MagicMock() - response.json = {"console": 2048} - compute.post = AsyncioMagicMock(return_value=response) - - # tests if get_next_application_id is called - with patch('gns3server.controller.project.get_next_application_id', return_value=222) as mocked_get_app_id: - node = async_run(project.add_node( - compute, "test", None, node_type="iou", properties={"startup_config": "test.cfg"})) - assert mocked_get_app_id.called - assert node.properties['application_id'] == 222 - - # tests if we can send property and it will be used - node = async_run(project.add_node( - compute, "test", None, node_type="iou", application_id=333, properties={"startup_config": "test.cfg"})) - assert mocked_get_app_id.called - assert node.properties['application_id'] == 333 - - def test_duplicate_node(project, async_run): compute = MagicMock() compute.id = "local"