Fix mojo_public_system_unittests CoreTest.MinimalCTest. TBR=jimbe@chromium.org Review URL: https://codereview.chromium.org/776993002
diff --git a/mojo/public/c/system/tests/core_unittest_pure_c.c b/mojo/public/c/system/tests/core_unittest_pure_c.c index 4696934..bb00927 100644 --- a/mojo/public/c/system/tests/core_unittest_pure_c.c +++ b/mojo/public/c/system/tests/core_unittest_pure_c.c
@@ -61,14 +61,17 @@ EXPECT_EQ(MOJO_RESULT_OK, MojoCreateMessagePipe(NULL, &handle0, &handle1)); signals = MOJO_HANDLE_SIGNAL_READABLE; - uint32_t result_index = 1; + uint32_t result_index = 123; struct MojoHandleSignalsState states[1]; EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, MojoNewWaitMany(&handle0, &signals, 1, 1, &result_index, states)); - EXPECT_EQ(0u, result_index); + // "Deadline exceeded" doesn't apply to a single handle, so this should leave + // |result_index| untouched. + EXPECT_EQ(123u, result_index); EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, states[0].satisfied_signals); - EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, + EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE | + MOJO_HANDLE_SIGNAL_PEER_CLOSED, states[0].satisfiable_signals); EXPECT_EQ(MOJO_RESULT_OK, @@ -87,7 +90,8 @@ EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, state.satisfied_signals); - EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, + EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE | + MOJO_HANDLE_SIGNAL_PEER_CLOSED, state.satisfiable_signals); num_bytes = (uint32_t)sizeof(buffer);