diff --git a/dependencies.yaml b/dependencies.yaml index a6238168d..02c6a2194 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -67,7 +67,7 @@ libevse-security: # OCPP libocpp: git: https://github.com/EVerest/libocpp.git - git_tag: e52ac969095804144af4896af1984cedaf45a3f8 + git_tag: c66383782a32827920af80314165843deed63c98 cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBOCPP" # Josev Josev: diff --git a/tests/ocpp_tests/test_sets/ocpp201/reservations.py b/tests/ocpp_tests/test_sets/ocpp201/reservations.py index 9a83eddfe..74e6a94c6 100644 --- a/tests/ocpp_tests/test_sets/ocpp201/reservations.py +++ b/tests/ocpp_tests/test_sets/ocpp201/reservations.py @@ -15,7 +15,7 @@ from ocpp.v201.datatypes import * from ocpp.v201 import call as call_201 from ocpp.v201 import call_result as call_result201 -from validations import validate_remote_start_stop_transaction +from validations import (validate_remote_start_stop_transaction, wait_for_callerror_and_validate) from ocpp.routing import on, create_route_map @@ -629,7 +629,6 @@ async def test_reservation_connector_occupied( # start charging session test_controller.plug_in() - # TODO mz fix comments everywhere in this file!!! # expect StatusNotification with status occupied assert await wait_for_and_validate( test_utility, @@ -735,13 +734,9 @@ async def test_reservation_connector_rejected( evse_id=1 ) - # expect ReserveNow response with status rejected - assert await wait_for_and_validate( - test_utility, - charge_point_v201, - "ReserveNow", - call_result201.ReserveNowPayload(ReserveNowStatusType.rejected), - ) + assert await wait_for_callerror_and_validate(test_utility, + charge_point_v201, + "NotImplemented") @pytest.mark.asyncio