Retry intermittent LocLoadFromFile() test failures

2 files changed, 20 insertions, 2 deletions

diff --git a/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
index a558c0c5..fd8679cb 100644
--- a/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
@@ -15,6 +15,7 @@ namespace DutilTests
         void CanLoadControlsWxl()
         {
             HRESULT hr = S_OK;
+            DWORD dwRetry = 0;
             WIX_LOCALIZATION* pLoc = NULL;
             LOC_CONTROL* pLocControl = NULL;
 
@@ -26,7 +27,15 @@ namespace DutilTests
                 NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
 
                 pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "controls.wxl"));
-                hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                do
+                {
+                    if (FAILED(hr))
+                    {
+                        ::Sleep(500);
+                    }
+
+                    hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                } while (FAILED(hr) && ++dwRetry < 5);
                 NativeAssert::Succeeded(hr, "Failed to parse controls.wxl: {0}", wxlFilePath);
 
                 Assert::Equal(3ul, pLoc->cLocControls);
diff --git a/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
index 1bfc4bb4..04130098 100644
--- a/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
@@ -15,6 +15,7 @@ namespace DutilTests
         void CanLoadStringsWxl()
         {
             HRESULT hr = S_OK;
+            DWORD dwRetry = 0;
             WIX_LOCALIZATION* pLoc = NULL;
             LOC_STRING* pLocString = NULL;
             LPWSTR sczValue = NULL;
@@ -27,7 +28,15 @@ namespace DutilTests
                 NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
 
                 pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "strings.wxl"));
-                hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                do
+                {
+                    if (FAILED(hr))
+                    {
+                        ::Sleep(500);
+                    }
+
+                    hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                } while (FAILED(hr) && ++dwRetry < 5);
                 NativeAssert::Succeeded(hr, "Failed to parse strings.wxl: {0}", wxlFilePath);
 
                 Assert::Equal(4ul, pLoc->cLocStrings);