From 6a773e3630019823671ebe679ed772234c5f1ac5 Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Thu, 18 Jun 2015 19:00:06 -0700 Subject: [PATCH] Be More Forgiving in EXPECT_ALMOST() (This is a merge of http://go/wvgerrit/14776) This change widens the range in EXPECT_ALMOST slightly, to allow for slight timing errors in the tests. Bug: 21489628 Change-Id: Ibb074c2d037566c307c0438efdda3841bc48f7ed --- libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index a5d2fbae..316bb947 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -59,6 +59,7 @@ const int kShortSleep = 1 * kSpeedMultiplier; const int kLongSleep = 2 * kSpeedMultiplier; const uint32_t kDuration = 2 * kSpeedMultiplier; const uint32_t kLongDuration = 5 * kSpeedMultiplier; +const uint32_t kAlmostRange = 3 * kSpeedMultiplier; } // namespace namespace wvoec { @@ -736,9 +737,9 @@ static void dump_openssl_error() { } // We don't expect exact timing. -#define EXPECT_ALMOST(A, B) \ - EXPECT_GE(A + kSpeedMultiplier, B); \ - EXPECT_LE(A - kSpeedMultiplier, B); +#define EXPECT_ALMOST(A, B) \ + EXPECT_GE(A + kAlmostRange, B); \ + EXPECT_LE(A - kAlmostRange, B); class Session { public: