diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-04 09:30:28 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-04 09:50:48 +0100 |
| commit | eef43192d4c7b2867638c54a2ac31adfc26476c7 (patch) | |
| tree | 64385be861f0a803e9d5d8e5fdb97ce33680fd20 /sal | |
| parent | 3b437b01a92944747912dfb12ee65c77d4aa1cbc (diff) | |
Improve unit test accuracy
I didn't take clock resolution into account when created the test,
and it failed for me occasionally because the value was slightly
less than expected.
The typical system tick resolution is documented at
https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/high-resolution-timers
Change-Id: Ie48b10d15b14f9ac7d292a2cc9916bcbfff44b6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111946
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/systools/test_retry_if_failed.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sal/qa/systools/test_retry_if_failed.cxx b/sal/qa/systools/test_retry_if_failed.cxx index 845cba83092d..7df83cb229a1 100644 --- a/sal/qa/systools/test_retry_if_failed.cxx +++ b/sal/qa/systools/test_retry_if_failed.cxx @@ -13,19 +13,22 @@ namespace test_systools { +constexpr int ClockRes = 15; // default interval between system clock ticks is ~15 ms on x86 + class test_retry_if_failed : public CppUnit::TestFixture { public: void test_success() { const DWORD nTicksBefore = GetTickCount(); - HRESULT hr = sal::systools::RetryIfFailed(10, 100, Tester(5)); + HRESULT hr = sal::systools::RetryIfFailed(10, 200, Tester(5)); const DWORD nTicksAfter = GetTickCount(); const DWORD nTicksElapsed = nTicksAfter > nTicksBefore ? nTicksAfter - nTicksBefore : std::numeric_limits<DWORD>::max() - nTicksBefore + nTicksAfter; CPPUNIT_ASSERT(SUCCEEDED(hr)); - CPPUNIT_ASSERT(nTicksElapsed >= 400); // 5 attempts, 4 sleeps by 100 ms + // 5 attempts, 4 sleeps by ~200 ms + CPPUNIT_ASSERT_GREATER(DWORD(800 - ClockRes), nTicksElapsed); } void test_failure() @@ -37,7 +40,8 @@ public: : std::numeric_limits<DWORD>::max() - nTicksBefore + nTicksAfter; CPPUNIT_ASSERT(FAILED(hr)); - CPPUNIT_ASSERT(nTicksElapsed >= 900); // 10 attempts, 9 sleeps by 100 ms + // 1 + 10 attempts, 10 sleeps by ~100 ms + CPPUNIT_ASSERT_GREATER(DWORD(1000 - ClockRes), nTicksElapsed); } CPPUNIT_TEST_SUITE(test_retry_if_failed); |