remove extra post_connect calls (lbbrhzn#1527)

* remove extra post_connect calls

* fix tests

---------

Co-authored-by: lbbrhzn <[email protected]>

Author: drc38

.devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "lbbrhzn/ocpp",
-    "image": "mcr.microsoft.com/devcontainers/python:3.12",
+    "image": "mcr.microsoft.com/devcontainers/python:3.13",
     "postCreateCommand": "scripts/setup",
     "forwardPorts": [
         8123

custom_components/ocpp/chargepoint.py

@@ -224,7 +224,6 @@ async def post_connect(self):
 
         try:
             self.status = STATE_OK
-            await asyncio.sleep(2)
             await self.fetch_supported_features()
             num_connectors: int = await self.get_number_of_connectors()
             self._metrics[cdet.connectors.value].value = num_connectors
@@ -389,9 +388,7 @@ async def _handle_call(self, msg):
 
     async def start(self):
         """Start charge point."""
-        await self.run(
-            [super().start(), self.post_connect(), self.monitor_connection()]
-        )
+        await self.run([super().start(), self.monitor_connection()])
 
     async def run(self, tasks):
         """Run a specified list of tasks."""
@@ -430,9 +427,7 @@ async def reconnect(self, connection: ServerConnection):
         if self.post_connect_success is True:
             await self.run([super().start(), self.monitor_connection()])
         else:
-            await self.run(
-                [super().start(), self.post_connect(), self.monitor_connection()]
-            )
+            await self.run([super().start(), self.monitor_connection()])
 
     async def async_update_device_info(
         self, serial: str, vendor: str, model: str, firmware_version: str

tests/test_charge_point_v16.py

@@ -51,6 +51,7 @@
     set_number,
     create_configuration,
     remove_configuration,
+    wait_ready,
 )
 
 SERVICES = [
@@ -307,6 +308,7 @@ async def test_cms_responses_restore_v16(
             await asyncio.wait_for(
                 asyncio.gather(
                     cp.start(),
+                    cp.send_boot_notification(),
                     cp.send_start_transaction(12344),
                     cp.send_meter_periodic_data(),
                 ),
@@ -325,6 +327,7 @@ async def test_cms_responses_restore_v16(
             await asyncio.wait_for(
                 asyncio.gather(
                     cp.start(),
+                    cp.send_boot_notification(),
                     cp.send_meter_periodic_data(),
                 ),
                 timeout=3,
@@ -436,8 +439,9 @@ async def test_cms_responses_actions_v16(
         cp = ChargePoint(f"{cp_id}_client", ws)
         with contextlib.suppress(asyncio.TimeoutError):
             cp_task = asyncio.create_task(cp.start())
-            await asyncio.sleep(5)
-            # Allow charger time to connect bfore running services
+            await cp.send_boot_notification()
+            await wait_ready(cs.charge_points[cp_id])
+            # Confirm charger completed post_connect before running services
             await asyncio.wait_for(
                 asyncio.gather(
                     cp.send_meter_clock_data(),
@@ -494,6 +498,7 @@ async def test_cms_responses_actions_v16(
             await asyncio.wait_for(
                 asyncio.gather(
                     cp.start(),
+                    cp.send_boot_notification(),
                     cp.send_start_transaction(0),
                     cp.send_meter_periodic_data(),
                     cp.send_main_meter_clock_data(),
@@ -526,6 +531,7 @@ async def test_cms_responses_actions_v16(
             await asyncio.wait_for(
                 asyncio.gather(
                     cp.start(),
+                    cp.send_boot_notification(),
                     cp.send_start_transaction(0),
                     cp.send_meter_energy_kwh(),
                     cp.send_meter_clock_data(),
@@ -585,8 +591,9 @@ async def test_cms_responses_errors_v16(
             cp = ChargePoint(f"{cp_id}_client", ws)
             cp.accept = False
             cp_task = asyncio.create_task(cp.start())
-            await asyncio.sleep(5)
-            # Allow charger time to reconnect bfore running services
+            await cp.send_boot_notification()
+            await wait_ready(cs.charge_points[cp_id])
+            # Confirm charger completed post_connect before running services
             await asyncio.wait_for(
                 asyncio.gather(
                     cs.charge_points[cp_id].trigger_boot_notification(),