oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit tests by removing warning checks

Browse Source
This commit is contained in:
Marek Wolan
2023-08-25 17:56:05 +01:00
parent ae6e835955
commit 6e602aa151
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/primaite/simulator/core.py
View File

@@ -1,6 +1,6 @@
"""Core of the PrimAITE Simulator.""" """Core of the PrimAITE Simulator."""
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from typing import Callable, Dict, List, Optional from typing import Callable, Dict, List, Optional, Union
from uuid import uuid4 from uuid import uuid4
from pydantic import BaseModel, ConfigDict, Extra from pydantic import BaseModel, ConfigDict, Extra
@@ -199,9 +199,9 @@ class SimComponent(BaseModel):
return self._parent return self._parent
@parent.setter @parent.setter
def parent(self, new_parent: "SimComponent") -> None: def parent(self, new_parent: Union["SimComponent", None]) -> None:
if self._parent: if self._parent and new_parent:
msg = f"Overwriting parent of {self}, {self._parent} with {new_parent}" msg = f"Overwriting parent of {self.uuid}. Old parent: {self._parent.uuid}, New parent: {new_parent.uuid}"
_LOGGER.warn(msg) _LOGGER.warn(msg)
raise RuntimeWarning(msg) raise RuntimeWarning(msg)
self._parent = new_parent self._parent = new_parent

23
tests/integration_tests/network/test_network_creation.py
View File

@@ -22,7 +22,6 @@ def test_readding_node():
net = Network() net = Network()
n1 = Node(hostname="computer") n1 = Node(hostname="computer")
net.add_node(n1) net.add_node(n1)
with pytest.raises(RuntimeWarning):
net.add_node(n1) net.add_node(n1)
assert n1.parent is net assert n1.parent is net
assert n1 in net assert n1 in net
@@ -32,7 +31,6 @@ def test_removing_nonexistent_node():
"""Check that warning is raised when trying to remove a node that is not in the network.""" """Check that warning is raised when trying to remove a node that is not in the network."""
net = Network() net = Network()
n1 = Node(hostname="computer") n1 = Node(hostname="computer")
with pytest.raises(RuntimeWarning):
net.remove_node(n1) net.remove_node(n1)
assert n1.parent is None assert n1.parent is None
assert n1 not in net assert n1 not in net
@@ -69,7 +67,6 @@ def test_connecting_node_to_itself():
net.add_node(node) net.add_node(node)
with pytest.raises(RuntimeError):
net.connect(node.nics[nic1.uuid], node.nics[nic2.uuid], bandwidth=30) net.connect(node.nics[nic1.uuid], node.nics[nic2.uuid], bandwidth=30)
assert node in net assert node in net
@@ -79,4 +76,22 @@ def test_connecting_node_to_itself():
def test_disconnecting_nodes(): def test_disconnecting_nodes():
... net = Network()
n1 = Node(hostname="computer")
n1_nic = NIC(ip_address="120.30.0.1", gateway="192.168.0.1", subnet_mask="255.255.255.0")
n1.connect_nic(n1_nic)
net.add_node(n1)
n2 = Node(hostname="server")
n2_nic = NIC(ip_address="120.30.0.2", gateway="192.168.0.1", subnet_mask="255.255.255.0")
n2.connect_nic(n2_nic)
net.add_node(n2)
net.connect(n1.nics[n1_nic.uuid], n2.nics[n2_nic.uuid], bandwidth=30)
assert len(net.links) == 1
link = list(net.links.values())[0]
net.remove_link(link)
assert link not in net
assert len(net.links) == 0