Fix Workflows and Badges

.github/workflows/test-pypy3.11.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (PyPy 3.11)
+name: PyPy 3.11
 
 on:
   push:

.github/workflows/test-python3.10.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (Python 3.10)
+name: 3.10
 
 on:
   push:

.github/workflows/test-python3.11.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (Python 3.11)
+name: 3.11
 
 on:
   push:

.github/workflows/test-python3.12.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (Python 3.12)
+name: 3.12
 
 on:
   push:

.github/workflows/test-python3.13.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (Python 3.13)
+name: 3.13
 
 on:
   push:

.github/workflows/test-python3.14.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (Python 3.14)
+name: 3.14
 
 on:
   push:

.github/workflows/test-python3.8.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (Python 3.8)
+name: 3.8
 
 on:
   push:

.github/workflows/test-python3.9.yml

@@ -1,4 +1,4 @@
-name: Unit Tests (Python 3.9)
+name: 3.9
 
 on:
   push:

README.md

@@ -2,23 +2,24 @@
 
 <!--<img src="doc/img/logo.png" alt="V2X Flex Stack" width="200"/>--> <img src="https://raw.githubusercontent.com/Fundacio-i2CAT/FlexStack/refs/heads/master/doc/img/i2cat_logo.png" alt="i2CAT Logo" width="200"/>
 
-![Python versions](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12%20|%203.13%20|%203.14-blue)
+![Python versions](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14%20%7C%20PyPy3.11-blue)
 
-[![3.8](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?label=3.8&style=flat-square&job=Unit%20Tests%20(Python%203.8))](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/general.yml)
-[![3.9](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?label=3.9&style=flat-square&job=Unit%20Tests%20(Python%203.9))](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/general.yml)
-[![3.10](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?label=3.10&style=flat-square&job=Unit%20Tests%20(Python%203.10))](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/general.yml)
-[![3.11](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?label=3.11&style=flat-square&job=Unit%20Tests%20(Python%203.11))](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/general.yml)
-[![3.12](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?label=3.12&style=flat-square&job=Unit%20Tests%20(Python%203.12))](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/general.yml)
-[![3.13](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?label=3.13&style=flat-square&job=Unit%20Tests%20(Python%203.13))](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/general.yml)
-[![3.14](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?label=3.14&style=flat-square&job=Unit%20Tests%20(Python%203.14))](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/general.yml)
+[![3.8](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.8.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.8.yml)
+[![3.9](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.9.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.9.yml)
+[![3.10](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.10.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.10.yml)
+[![3.11](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.11.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.11.yml)
+[![3.12](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.12.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.12.yml)
+[![3.13](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.13.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.13.yml)
+[![3.14](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.14.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-python3.14.yml)
+[![PyPy 3.11](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-pypy3.11.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/test-pypy3.11.yml)
 
 ![Coverage](https://img.shields.io/codecov/c/github/YOUR_USER/YOUR_REPO)
 ![Flake8](https://img.shields.io/badge/code%20style-flake8-blue)
 ![Pylint](https://img.shields.io/badge/lint-pylint-yellowgreen)
 ![Pyright](https://img.shields.io/badge/type--checker-pyright-blue)
 
 
-![Test Coverage](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?job=Test%20Coverage&label=Coverage) ![Run Flake8](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?job=Run%20Flake8&label=Flake8) ![Run Pylint](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?job=Run%20Pylint&label=Pylint) ![Run Pyright](https://img.shields.io/github/actions/workflow/status/Fundacio-i2CAT/FlexStack/general.yml?job=Run%20Pyright&label=Pyright)
+[![Test Coverage](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/coverage.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/coverage.yml) [![Flake8](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/flake8.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/flake8.yml) [![Flake8](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/flake8.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/flake8.yml) [![Pyright](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/pyright.yml/badge.svg)](https://github.com/Fundacio-i2CAT/FlexStack/actions/workflows/pyright.yml)
 
 
 # Short description

tests/flexstack/facilities/local_dynamic_map/test_ldm_maintenance_reactive.py

@@ -17,13 +17,13 @@ def setUp(self, mock_monotonic):
         )
 
     @patch("time.monotonic")
-    @patch("builtins.super")
-    def test_add_provider_data(self, mock_ldm_maintenace, mock_monotonic):
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.add_provider_data")
+    def test_add_provider_data(self, mock_parent_add_provider_data, mock_monotonic):
         mock_monotonic.return_value = 1000.0
-        mock_ldm_maintenace().add_provider_data = MagicMock(return_value=1)
+        mock_parent_add_provider_data.return_value = 1
         self.ldm_maintenance_reactive.collect_trash = MagicMock()
         test_add_data_provider_req = MagicMock()
 
         self.ldm_maintenance_reactive.add_provider_data(test_add_data_provider_req)
-        mock_ldm_maintenace().add_provider_data.assert_called_once_with(test_add_data_provider_req)
+        mock_parent_add_provider_data.assert_called_once_with(test_add_data_provider_req)
         self.ldm_maintenance_reactive.collect_trash.assert_called_once()

tests/flexstack/facilities/local_dynamic_map/test_ldm_maintenance_thread.py

@@ -30,9 +30,9 @@ def test__init__(self):
         self.threading_thread.start.assert_called_once()
         self.mock_lock.assert_called()
 
-    @patch("builtins.super")
-    def test_add_data_provider(self, mock_super):
-        mock_super().add_provider_data = MagicMock(return_value=1)
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.add_provider_data")
+    def test_add_data_provider(self, mock_parent_add_provider_data):
+        mock_parent_add_provider_data.return_value = 1
         add_data_provider_request = AddDataProviderReq(
             application_id=1,
             timestamp=TimestampIts(1000),
@@ -43,32 +43,32 @@ def test_add_data_provider(self, mock_super):
         self.assertEqual(self.ldm_maintenance_thread.add_provider_data(
             add_data_provider_request), 1)
 
-    @patch("builtins.super")
-    def test_get_provider_data(self, mock_super):
-        mock_super().get_provider_data = MagicMock(return_value=1)
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.get_provider_data")
+    def test_get_provider_data(self, mock_parent_get_provider_data):
+        mock_parent_get_provider_data.return_value = 1
         self.assertEqual(self.ldm_maintenance_thread.get_provider_data(1), 1)
 
-    @patch("builtins.super")
-    def test_update_provider_data(self, mock_super):
-        mock_super().update_provider_data = MagicMock(return_value=1)
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.update_provider_data")
+    def test_update_provider_data(self, mock_parent_update_provider_data):
+        mock_parent_update_provider_data.return_value = 1
         self.ldm_maintenance_thread.update_provider_data(1, TEST_DATA)
-        mock_super().update_provider_data.assert_called_once_with(1, TEST_DATA)
+        mock_parent_update_provider_data.assert_called_once_with(1, TEST_DATA)
 
-    @patch("builtins.super")
-    def test_del_provider_data(self, mock_super):
-        mock_super().del_provider_data = MagicMock(return_value=1)
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.del_provider_data")
+    def test_del_provider_data(self, mock_parent_del_provider_data):
+        mock_parent_del_provider_data.return_value = 1
         self.ldm_maintenance_thread.del_provider_data(TEST_DATA)
-        mock_super().del_provider_data.assert_called_once_with(TEST_DATA)
+        mock_parent_del_provider_data.assert_called_once_with(TEST_DATA)
 
-    @patch("builtins.super")
-    def test_get_all_data_containers(self, mock_super):
-        mock_super().get_all_data_containers = MagicMock(return_value=1)
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.get_all_data_containers")
+    def test_get_all_data_containers(self, mock_parent_get_all_data_containers):
+        mock_parent_get_all_data_containers.return_value = 1
         self.assertEqual(
             self.ldm_maintenance_thread.get_all_data_containers(), 1)
 
-    @patch("builtins.super")
-    def test_search_data_contaier(self, mock_super):
-        mock_super().search_data_containers = MagicMock(return_value=1)
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.search_data_containers")
+    def test_search_data_contaier(self, mock_parent_search_data_containers):
+        mock_parent_search_data_containers.return_value = 1
         request_data_objects_req = RequestDataObjectsReq(
             application_id=CAM,
             data_object_type=(CAM,),
@@ -80,8 +80,8 @@ def test_search_data_contaier(self, mock_super):
         self.assertEqual(self.ldm_maintenance_thread.search_data_containers(
             request_data_objects_req), 1)
 
-    @patch("builtins.super")
-    def test_check_data_container(self, mock_super):
-        mock_super().check_new_data_recieved = MagicMock(return_value=1)
+    @patch("flexstack.facilities.local_dynamic_map.ldm_maintenance.LDMMaintenance.check_new_data_recieved")
+    def test_check_data_container(self, mock_parent_check_new_data_recieved):
+        mock_parent_check_new_data_recieved.return_value = 1
         self.assertEqual(
             self.ldm_maintenance_thread.check_new_data_recieved(), 1)

tests/flexstack/facilities/local_dynamic_map/test_ldm_service_reactive.py

@@ -14,11 +14,11 @@ def setUp(self, mock_monotonic):
         self.ldm_maintenance = MagicMock()
         self.ldm_service = LDMServiceReactive(self.ldm_maintenance)
 
-    @patch("builtins.super")
+    @patch("flexstack.facilities.local_dynamic_map.ldm_service.LDMService.add_provider_data")
     @patch("time.monotonic")
-    def test_add_provider_data(self, mock_monotonic, mock_ldm_service):
+    def test_add_provider_data(self, mock_monotonic, mock_parent_add_provider_data):
         mock_monotonic.return_value = 1000.0
-        mock_ldm_service().add_provider_data = MagicMock(return_value=1)
+        mock_parent_add_provider_data.return_value = 1
         self.ldm_service.attend_subscriptions = MagicMock()
         test_dict = {"a": 1, "b": 2}
 
@@ -29,5 +29,5 @@ def test_add_provider_data(self, mock_monotonic, mock_ldm_service):
             data_object=test_dict,
             time_validity=MagicMock(),)
         self.ldm_service.add_provider_data(provider_data_request)
-        mock_ldm_service().add_provider_data.assert_called_once_with(provider_data_request)
+        mock_parent_add_provider_data.assert_called_once_with(provider_data_request)
         self.ldm_service.attend_subscriptions.assert_called_once()