diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-05-28 15:41:20 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-05-28 16:47:32 -0700 |
| commit | 67f9ee7891738bf78b34315d6c9ca259da8d215d (patch) | |
| tree | 7a63613bf63b0ebaf2c7c9fc256d0e2758bf93c7 /src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp | |
| parent | 7094921513576f1c81ff5e5cfcfe013d79edce5f (diff) | |
| download | wix-67f9ee7891738bf78b34315d6c9ca259da8d215d.tar.gz wix-67f9ee7891738bf78b34315d6c9ca259da8d215d.tar.bz2 wix-67f9ee7891738bf78b34315d6c9ca259da8d215d.zip | |
Retry intermittent LocLoadFromFile() test failures
Diffstat (limited to 'src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp')
| -rw-r--r-- | src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
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 | |||
| 15 | void CanLoadStringsWxl() | 15 | void CanLoadStringsWxl() |
| 16 | { | 16 | { |
| 17 | HRESULT hr = S_OK; | 17 | HRESULT hr = S_OK; |
| 18 | DWORD dwRetry = 0; | ||
| 18 | WIX_LOCALIZATION* pLoc = NULL; | 19 | WIX_LOCALIZATION* pLoc = NULL; |
| 19 | LOC_STRING* pLocString = NULL; | 20 | LOC_STRING* pLocString = NULL; |
| 20 | LPWSTR sczValue = NULL; | 21 | LPWSTR sczValue = NULL; |
| @@ -27,7 +28,15 @@ namespace DutilTests | |||
| 27 | NativeAssert::Succeeded(hr, "Failed to initialize Xml."); | 28 | NativeAssert::Succeeded(hr, "Failed to initialize Xml."); |
| 28 | 29 | ||
| 29 | pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "strings.wxl")); | 30 | pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "strings.wxl")); |
| 30 | hr = LocLoadFromFile(wxlFilePath, &pLoc); | 31 | do |
| 32 | { | ||
| 33 | if (FAILED(hr)) | ||
| 34 | { | ||
| 35 | ::Sleep(500); | ||
| 36 | } | ||
| 37 | |||
| 38 | hr = LocLoadFromFile(wxlFilePath, &pLoc); | ||
| 39 | } while (FAILED(hr) && ++dwRetry < 5); | ||
| 31 | NativeAssert::Succeeded(hr, "Failed to parse strings.wxl: {0}", wxlFilePath); | 40 | NativeAssert::Succeeded(hr, "Failed to parse strings.wxl: {0}", wxlFilePath); |
| 32 | 41 | ||
| 33 | Assert::Equal(4ul, pLoc->cLocStrings); | 42 | Assert::Equal(4ul, pLoc->cLocStrings); |
