Skip to content

Commit ceb5985

Browse files
neilconwaytnachen
authored andcommitted
Silenced two more GMock warnings about shutdown expectations.
In these tests: * MasterTest.OrphanTasks * StatusUpdateManagerTest.LatestTaskState Review: https://reviews.apache.org/r/42673/
1 parent 8be32ab commit ceb5985

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/tests/master_tests.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -2379,6 +2379,9 @@ TEST_F(MasterTest, OrphanTasks)
23792379
orphanTasks = state.values["orphan_tasks"].as<JSON::Array>();
23802380
EXPECT_EQ(0u, orphanTasks.values.size());
23812381

2382+
EXPECT_CALL(exec, shutdown(_))
2383+
.Times(AtMost(1));
2384+
23822385
// Cleanup.
23832386
driver.stop();
23842387
driver.join();

src/tests/status_update_manager_tests.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,9 @@ TEST_F(StatusUpdateManagerTest, LatestTaskState)
834834
ASSERT_EQ(TASK_FINISHED,
835835
statusUpdateMessage2.get().update().latest_state());
836836

837+
EXPECT_CALL(exec, shutdown(_))
838+
.Times(AtMost(1));
839+
837840
driver.stop();
838841
driver.join();
839842

support/vote.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -e
1010
. $(dirname ${0})/atexit.sh
1111

1212
# Use colors for errors.
13-
. $(dirname ${0})/colors.sh
13+
#. $(dirname ${0})/colors.sh
1414

1515
test ${#} -eq 2 || \
1616
{ echo "Usage: `basename ${0}` [version] [candidate]"; exit 1; }

0 commit comments

Comments
 (0)