Skip to content

test: Re-enable guarddog tests which were accidentally disabled due to a parameterized test mishap. #6462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 3 commits into from
Apr 2, 2019
Merged

test: Re-enable guarddog tests which were accidentally disabled due to a parameterized test mishap. #6462

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
709bbbe
test: Re-enable guarddog tests which were accidentally disabled due t…
jmarantz Apr 2, 2019
34c568a
Add comments about trying to deflake the real-time tests.
jmarantz Apr 2, 2019
77d9731
format
jmarantz Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions test/server/guarddog_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,18 @@ class GuardDogDeathTest : public GuardDogTestBase {
WatchDogSharedPtr second_dog_;
};

INSTANTIATE_TEST_SUITE_P(TimeSystemType, GuardDogDeathTest,
testing::ValuesIn({TimeSystemType::Real, TimeSystemType::Simulated}));

// These tests use threads, and need to run after the real death tests, so we need to call them
// a different name.
class GuardDogAlmostDeadTest : public GuardDogDeathTest {};

INSTANTIATE_TEST_SUITE_P(
TimeSystemType, GuardDogAlmostDeadTest,
testing::ValuesIn({// TODO(#6464): TimeSystemType::Real -- fails in this suite 30/1000 times.
TimeSystemType::Simulated}));

TEST_P(GuardDogDeathTest, KillDeathTest) {
// Is it German for "The Function"? Almost...
auto die_function = [&]() -> void {
Expand Down Expand Up @@ -190,6 +198,9 @@ class GuardDogMissTest : public GuardDogTestBase {
NiceMock<Configuration::MockMain> config_mega_;
};

INSTANTIATE_TEST_SUITE_P(TimeSystemType, GuardDogMissTest,
testing::ValuesIn({TimeSystemType::Real, TimeSystemType::Simulated}));

TEST_P(GuardDogMissTest, MissTest) {
// This test checks the actual collected statistics after doing some timer
// advances that should and shouldn't increment the counters.
Expand All @@ -210,6 +221,11 @@ TEST_P(GuardDogMissTest, MissTest) {
}

TEST_P(GuardDogMissTest, MegaMissTest) {
// TODO(#6464): This test fails in real-time 1/1000 times, but passes in simulated time.
if (GetParam() == TimeSystemType::Real) {
return;
}

// This test checks the actual collected statistics after doing some timer
// advances that should and shouldn't increment the counters.
initGuardDog(stats_store_, config_mega_);
Expand All @@ -229,6 +245,11 @@ TEST_P(GuardDogMissTest, MegaMissTest) {
}

TEST_P(GuardDogMissTest, MissCountTest) {
// TODO(#6464): This test fails in real-time 9/1000 times, but passes in simulated time.
if (GetParam() == TimeSystemType::Real) {
return;
}

// This tests a flake discovered in the MissTest where real timeout or
// spurious condition_variable wakeup causes the counter to get incremented
// more than it should be.
Expand Down