PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "tests: Specify the death test style to avoid flakiness."

Browse Source 
am: 878d5a77f0

Change-Id: Ia1cb4cea72323c80d605fdd9cedfa80d5e3145fb
This commit is contained in:
Tao Bao
2018-06-05 23:21:32 -07:00
committed by android-build-merger
parent 321a7134e9 878d5a77f0
commit d770790a8f
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/rangeset_test.cpp
+3
View File
@@ -209,6 +209,7 @@ TEST(RangeSetTest, GetBlockNumber) {
ASSERT_EQ(static_cast<size_t>(6), rs.GetBlockNumber(5)); ASSERT_EQ(static_cast<size_t>(6), rs.GetBlockNumber(5));
ASSERT_EQ(static_cast<size_t>(9), rs.GetBlockNumber(8)); ASSERT_EQ(static_cast<size_t>(9), rs.GetBlockNumber(8));
::testing::FLAGS_gtest_death_test_style = "threadsafe";
// Out of bound. // Out of bound.
ASSERT_EXIT(rs.GetBlockNumber(9), ::testing::KilledBySignal(SIGABRT), ""); ASSERT_EXIT(rs.GetBlockNumber(9), ::testing::KilledBySignal(SIGABRT), "");
} }
@@ -284,6 +285,8 @@ TEST(SortedRangeSetTest, file_range) {
ASSERT_EQ(static_cast<size_t>(10), rs.GetOffsetInRangeSet(4106)); ASSERT_EQ(static_cast<size_t>(10), rs.GetOffsetInRangeSet(4106));
ASSERT_EQ(static_cast<size_t>(40970), rs.GetOffsetInRangeSet(4096 * 16 + 10)); ASSERT_EQ(static_cast<size_t>(40970), rs.GetOffsetInRangeSet(4096 * 16 + 10));
::testing::FLAGS_gtest_death_test_style = "threadsafe";
// block#10 not in range. // block#10 not in range.
ASSERT_EXIT(rs.GetOffsetInRangeSet(40970), ::testing::KilledBySignal(SIGABRT), ""); ASSERT_EXIT(rs.GetOffsetInRangeSet(40970), ::testing::KilledBySignal(SIGABRT), "");
} }
tests/unit/screen_ui_test.cpp
+2
View File
@@ -408,5 +408,7 @@ TEST_F(ScreenRecoveryUITest, LoadAnimation_MissingAnimation) {
ASSERT_TRUE(ui_->Init(kTestLocale)); ASSERT_TRUE(ui_->Init(kTestLocale));
TemporaryDir resource_dir; TemporaryDir resource_dir;
Paths::Get().set_resource_dir(resource_dir.path); Paths::Get().set_resource_dir(resource_dir.path);
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(ui_->RunLoadAnimation(), ::testing::KilledBySignal(SIGABRT), ""); ASSERT_EXIT(ui_->RunLoadAnimation(), ::testing::KilledBySignal(SIGABRT), "");
} }