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

Fix web browser tests.

Browse Source
This commit is contained in:
Marek Wolan
2023-11-29 14:33:52 +00:00
parent a16116a688
commit ac2f7ba757
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/primaite/simulator/system/applications/web_browser.py
View File

@@ -76,7 +76,7 @@ class WebBrowser(Application):
def reset_component_for_episode(self, episode: int): def reset_component_for_episode(self, episode: int):
"""Reset the original state of the SimComponent.""" """Reset the original state of the SimComponent."""
def get_webpage(self) -> bool: def get_webpage(self, url: Optional[str] = None) -> bool:
""" """
Retrieve the webpage. Retrieve the webpage.
@@ -85,7 +85,7 @@ class WebBrowser(Application):
:param: url: The address of the web page the browser requests :param: url: The address of the web page the browser requests
:type: url: str :type: url: str
""" """
url = self.target_url url = url or self.target_url
if not self._can_perform_action(): if not self._can_perform_action():
return False return False

4
tests/e2e_integration_tests/test_primaite_session.py
View File

@@ -76,6 +76,10 @@ class TestPrimaiteSession:
with pytest.raises(pydantic.ValidationError): with pytest.raises(pydantic.ValidationError):
session = TempPrimaiteSession.from_config(MISCONFIGURED_PATH) session = TempPrimaiteSession.from_config(MISCONFIGURED_PATH)
@pytest.mark.skip(
reason="Currently software cannot be dynamically created/destroyed during simulation. Therefore, "
"reset doesn't implement software restore."
)
@pytest.mark.parametrize("temp_primaite_session", [[CFG_PATH]], indirect=True) @pytest.mark.parametrize("temp_primaite_session", [[CFG_PATH]], indirect=True)
def test_session_sim_reset(self, temp_primaite_session): def test_session_sim_reset(self, temp_primaite_session):
with temp_primaite_session as session: with temp_primaite_session as session:

3
tests/integration_tests/system/test_web_client_server.py
View File

@@ -27,10 +27,11 @@ def test_web_page_get_users_page_request_with_domain_name(uc2_network):
web_client: WebBrowser = client_1.software_manager.software["WebBrowser"] web_client: WebBrowser = client_1.software_manager.software["WebBrowser"]
web_client.run() web_client.run()
assert web_client.operating_state == ApplicationOperatingState.RUNNING assert web_client.operating_state == ApplicationOperatingState.RUNNING
web_client.target_url = "http://arcd.com/users/"
assert web_client.get_webpage() is True assert web_client.get_webpage() is True
# latest reponse should have status code 200 # latest response should have status code 200
assert web_client.latest_response is not None assert web_client.latest_response is not None
assert web_client.latest_response.status_code == HttpStatusCode.OK assert web_client.latest_response.status_code == HttpStatusCode.OK