Merge pull request #55795 from twangboy/fix_win_lgpo

Fix issue with whitespace in ADML data

salt/modules/win_lgpo.py

@@ -5639,7 +5639,9 @@ def _getAdmlDisplayName(adml_xml_data, display_name):
                                                  displayNameId=displayname_id)
         if search_results:
             for result in search_results:
-                return result.text
+                # Needs the `strip()` because some adml data has an extra space
+                # at the end
+                return result.text.strip()
 
     return None
 

tests/unit/modules/test_win_lgpo.py

@@ -10,6 +10,7 @@
 # Import Salt Testing Libs
 from tests.support.helpers import destructiveTest
 from tests.support.mixins import LoaderModuleMockMixin
+from tests.support.mock import MagicMock, Mock, patch
 from tests.support.unit import TestCase, skipIf
 
 # Import Salt Libs
@@ -47,6 +48,18 @@ class WinLGPOTestCase(TestCase):
     '''
     encoded_null = chr(0).encode('utf-16-le')
 
+    def test__getAdmlDisplayName(self):
+        display_name = '$(string.KeepAliveTime1)'
+        adml_xml_data = 'junk, we are mocking the return'
+        obj_xpath = Mock()
+        obj_xpath.text = '300000 or 5 minutes (recommended) '
+        mock_xpath_obj = MagicMock(return_value=[obj_xpath])
+        with patch.object(win_lgpo, 'ADML_DISPLAY_NAME_XPATH', mock_xpath_obj):
+            result = win_lgpo._getAdmlDisplayName(adml_xml_data=adml_xml_data,
+                                                  display_name=display_name)
+        expected = '300000 or 5 minutes (recommended)'
+        self.assertEqual(result, expected)
+
     def test__encode_string(self):
         '''
         ``_encode_string`` should return a null terminated ``utf-16-le`` encoded