Merge "Increase leniency of attestation record timestamps" into qt-dev am: 6c4e33d079

am: 89fda5c7f9

Change-Id: I063e8cd6e53da1af4a50df9273a5ada4b9e7ea87
This commit is contained in:
Garret Kelly
2019-06-25 23:28:39 -07:00
committed by android-build-merger

View File

@@ -216,8 +216,8 @@ void KeymasterHidlTest::CheckCreationDateTime(
std::chrono::system_clock::now();
std::chrono::time_point<std::chrono::system_clock> reported_time{
std::chrono::milliseconds(sw_enforced[i].f.dateTime)};
// The test is flaky for EC keys, so a buffer time of 1 second will be added.
EXPECT_LE(creation - 1s, reported_time);
// The test is flaky for EC keys, so a buffer time of 120 seconds will be added.
EXPECT_LE(creation - 120s, reported_time);
EXPECT_LE(reported_time, now + 1s);
}
}