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

#1962: merge dev into branch + fix minor diffs + ensure that imports pull from src

Browse Source
This commit is contained in:
Czar.Echavez
2023-11-08 10:36:47 +00:00
parent eba10ae5ef c060991084
commit f5df1366a7
201 changed files with 4799 additions and 16458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration_tests/component_creation/test_action_integration.py
View File

@@ -1,11 +1,11 @@
import pytest
from primaite.simulator.core import RequestType
from primaite.simulator.network.hardware.nodes.computer import Computer
from primaite.simulator.network.hardware.nodes.server import Server
from primaite.simulator.network.hardware.nodes.switch import Switch
from primaite.simulator.sim_container import Simulation
from primaite.simulator.system.services.database.database_service import DatabaseService
from src.primaite.simulator.core import RequestType
from src.primaite.simulator.network.hardware.nodes.computer import Computer
from src.primaite.simulator.network.hardware.nodes.server import Server
from src.primaite.simulator.network.hardware.nodes.switch import Switch
from src.primaite.simulator.sim_container import Simulation
from src.primaite.simulator.system.services.database.database_service import DatabaseService
def test_passing_actions_down(monkeypatch) -> None:

4
tests/integration_tests/component_creation/test_permission_system.py
View File

@@ -3,8 +3,8 @@ from typing import Dict, List, Literal
import pytest
from primaite.simulator.core import AllowAllValidator, RequestManager, RequestType, SimComponent
from primaite.simulator.domain.controller import AccountGroup, GroupMembershipValidator
from src.primaite.simulator.core import AllowAllValidator, RequestManager, RequestType, SimComponent
from src.primaite.simulator.domain.controller import AccountGroup, GroupMembershipValidator
@pytest.mark.skip(reason="Action validation is not currently a required feature.")