CCM-12616: Attempt to fix mesh-poll lambda's packaging

Author: gareth-allan

lambdas/mesh-poll/Makefile

@@ -8,11 +8,11 @@ install-dev:
 	pip install -r requirements-dev.txt
 
 test:
-	cd ../.. && PYTHONPATH=lambdas/mesh-poll:$$PYTHONPATH pytest lambdas/mesh-poll/src/__tests__/ -v
+	cd ../.. && PYTHONPATH=lambdas/mesh-poll:$$PYTHONPATH pytest lambdas/mesh-poll/mesh_poll/__tests__/ -v
 
 coverage:
-	cd ../.. && PYTHONPATH=lambdas/mesh-poll:$$PYTHONPATH pytest lambdas/mesh-poll/src/__tests__/ \
-		--cov=lambdas/mesh-poll/src \
+	cd ../.. && PYTHONPATH=lambdas/mesh-poll:$$PYTHONPATH pytest lambdas/mesh-poll/mesh_poll/__tests__/ \
+		--cov=lambdas/mesh-poll/mesh_poll \
 		--cov-config=lambdas/mesh-poll/pytest.ini \
 		--cov-report=html:lambdas/mesh-poll/htmlcov \
 		--cov-report=term-missing \

lambdas/mesh-poll/src/__init__.py lambdas/mesh-poll/mesh_poll/__init__.pylambdas/mesh-poll/src/__init__.py renamed to lambdas/mesh-poll/mesh_poll/__init__.py

@@ -35,13 +35,13 @@ def setup_mocks():
 class TestHandler:
     """Test suite for Lambda handler"""
 
-    @patch('src.handler.Config')
-    @patch('src.handler.SenderLookup')
-    @patch('src.handler.MeshMessageProcessor')
-    @patch('src.handler.client')
+    @patch('mesh_poll.handler.Config')
+    @patch('mesh_poll.handler.SenderLookup')
+    @patch('mesh_poll.handler.MeshMessageProcessor')
+    @patch('mesh_poll.handler.client')
     def test_handler_success(self, mock_boto_client, mock_processor_class, mock_sender_lookup_class, mock_config_class):
         """Test successful handler execution"""
-        from src.handler import handler
+        from mesh_poll.handler import handler
 
         (mock_context, mock_config, mock_ssm,
         mock_sender_lookup, mock_processor) = setup_mocks()
@@ -82,13 +82,13 @@ def test_handler_success(self, mock_boto_client, mock_processor_class, mock_send
         # Verify process_messages was called
         mock_processor.process_messages.assert_called_once()
 
-    @patch('src.handler.Config')
-    @patch('src.handler.SenderLookup')
-    @patch('src.handler.MeshMessageProcessor')
-    @patch('src.handler.client')
+    @patch('mesh_poll.handler.Config')
+    @patch('mesh_poll.handler.SenderLookup')
+    @patch('mesh_poll.handler.MeshMessageProcessor')
+    @patch('mesh_poll.handler.client')
     def test_handler_config_cleanup_on_exception(self, mock_boto_client, mock_processor_class, mock_sender_lookup_class, mock_config_class):
         """Test that Config context manager cleanup is called even on exception"""
-        from src.handler import handler
+        from mesh_poll.handler import handler
 
         (mock_context, mock_config, mock_ssm,
         mock_sender_lookup, mock_processor) = setup_mocks()

…bdas/mesh-poll/src/__tests__/__init__.py …esh-poll/mesh_poll/__tests__/__init__.pylambdas/mesh-poll/src/__tests__/__init__.py renamed to lambdas/mesh-poll/mesh_poll/__tests__/__init__.py lambdas/mesh-poll/src/__tests__/__init__.py renamed to lambdas/mesh-poll/mesh_poll/__tests__/__init__.py

@@ -2,10 +2,9 @@
 Tests for mesh-poll MeshMessageProcessor
 Following the pattern from backend comms-mgr mesh-poll tests
 """
-import pytest
 from unittest.mock import Mock, call, patch
 from mesh_client import MeshClient
-from src.processor import MeshMessageProcessor
+from mesh_poll.processor import MeshMessageProcessor
 
 
 def setup_mocks():
@@ -62,7 +61,7 @@ def get_remaining_time_in_millis_near_timeout():
     return 100
 
 
-@patch('src.processor.EventPublisher')
+@patch('mesh_poll.processor.EventPublisher')
 class TestMeshMessageProcessor:
     """Test suite for MeshMessageProcessor"""
 

…/mesh-poll/src/__tests__/test_handler.py …poll/mesh_poll/__tests__/test_handler.pylambdas/mesh-poll/src/__tests__/test_handler.py renamed to lambdas/mesh-poll/mesh_poll/__tests__/test_handler.py lambdas/mesh-poll/src/__tests__/test_handler.py renamed to lambdas/mesh-poll/mesh_poll/__tests__/test_handler.py

@@ -2,9 +2,8 @@
 Tests for SenderLookup
 """
 import json
-import pytest
 from unittest.mock import Mock, call
-from src.sender_lookup import SenderLookup
+from mesh_poll.sender_lookup import SenderLookup
 
 
 def setup_mocks():