Merge branch 'ADCM-5646' into 'develop'

Starovoitov · Starovoitov · commit 79b88ef804e5 · 2024-06-03T15:12:24.000Z
ADCM-5646: Fix return value for adcm_check plugin

See merge request arenadata/development/adcm!3866
diff --git a/python/ansible_plugin/executors/check.py b/python/ansible_plugin/executors/check.py
@@ -152,6 +152,6 @@ def __call__(
                 assign_view_logstorage_permissions_by_job(log_storage)
         except AdcmEx as e:
             error_message = f"Failed to create checklog: {check_data}, group: {group_data}, error: {e}"
-            return CallResult(value=None, changed=False, error=PluginRuntimeError(message=error_message))
+            return CallResult(value="", changed=False, error=PluginRuntimeError(message=error_message))
 
-        return CallResult(value=None, changed=True, error=None)
+        return CallResult(value="", changed=True, error=None)
diff --git a/python/ansible_plugin/tests/test_adcm_check.py b/python/ansible_plugin/tests/test_adcm_check.py
@@ -183,7 +183,7 @@ def test_adcm_check_no_msg_and_there_success_msg_and_fail_msg_success(self) -> N
         result = executor.execute()
 
         self.assertIsNone(result.error)
-        self.assertIsNone(result.value)
+        self.assertEqual(result.value, "")
         self.assertTrue(result.changed)
 
     def test_adcm_check_group_title_and_group_success_msg_success(self) -> None:
@@ -245,7 +245,7 @@ def test_adcm_check_group_title_no_group_msg_but_there_msg_success(self) -> None
         result = executor.execute()
 
         self.assertIsNone(result.error)
-        self.assertIsNone(result.value, None)
+        self.assertEqual(result.value, "")
         self.assertTrue(result.changed)
 
     def test_adcm_check_group_title_no_group_msg_fail(self) -> None:
@@ -286,9 +286,7 @@ def test_adcm_check_double_call_val_success(self) -> None:
         executor.execute()
         result = executor.execute()
 
-        self.assertIsNone(
-            result.value,
-        )
+        self.assertEqual(result.value, "")
         self.assertTrue(result.changed)
 
         self.assertEqual(GroupCheckLog.objects.all().count(), 1)
