Index: mojo/public/c/system/tests/core_unittest.cc |
diff --git a/mojo/public/c/system/tests/core_unittest.cc b/mojo/public/c/system/tests/core_unittest.cc |
index 8a5438079a3589300e6bf05fb4a2113b9fbbd242..ada99d4b73aa329014e99f5cc6cfa3888ad4347b 100644 |
--- a/mojo/public/c/system/tests/core_unittest.cc |
+++ b/mojo/public/c/system/tests/core_unittest.cc |
@@ -41,9 +41,9 @@ TEST(CoreTest, InvalidHandle) { |
EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(MOJO_HANDLE_INVALID)); |
// Wait: |
- EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, |
- MojoWait(MOJO_HANDLE_INVALID, ~MOJO_HANDLE_SIGNAL_NONE, 1000000, |
- nullptr)); |
+ EXPECT_EQ( |
+ MOJO_RESULT_INVALID_ARGUMENT, |
+ MojoWait(MOJO_HANDLE_INVALID, ~MOJO_HANDLE_SIGNAL_NONE, 0, nullptr)); |
h0 = MOJO_HANDLE_INVALID; |
sig = ~MOJO_HANDLE_SIGNAL_NONE; |
@@ -98,16 +98,9 @@ TEST(CoreTest, BasicMessagePipe) { |
EXPECT_NE(h0, MOJO_HANDLE_INVALID); |
EXPECT_NE(h1, MOJO_HANDLE_INVALID); |
- // Shouldn't be readable, we haven't written anything. |
+ // Shouldn't be readable, we haven't written anything. Should be writable. |
MojoHandleSignalsState state; |
- EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, |
- MojoWait(h0, MOJO_HANDLE_SIGNAL_READABLE, 0, &state)); |
- EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, state.satisfied_signals); |
- EXPECT_EQ(kSignalAll, state.satisfiable_signals); |
- |
- // Should be writable. |
- EXPECT_EQ(MOJO_RESULT_OK, |
- MojoWait(h0, MOJO_HANDLE_SIGNAL_WRITABLE, 0, &state)); |
+ EXPECT_EQ(MOJO_RESULT_OK, MojoQueryHandleSignalsState(h0, &state)); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, state.satisfied_signals); |
EXPECT_EQ(kSignalAll, state.satisfiable_signals); |
@@ -147,9 +140,7 @@ TEST(CoreTest, BasicMessagePipe) { |
EXPECT_STREQ(kHello, buffer); |
// |h0| should no longer be readable. |
- EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, |
- MojoWait(h0, MOJO_HANDLE_SIGNAL_READABLE, 10, &state)); |
- |
+ EXPECT_EQ(MOJO_RESULT_OK, MojoQueryHandleSignalsState(h0, &state)); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, state.satisfied_signals); |
EXPECT_EQ(kSignalAll, state.satisfiable_signals); |
@@ -164,7 +155,7 @@ TEST(CoreTest, BasicMessagePipe) { |
EXPECT_EQ( |
MOJO_RESULT_FAILED_PRECONDITION, |
MojoWait(h1, MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, |
- 1000, &state)); |
+ MOJO_DEADLINE_INDEFINITE, &state)); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, state.satisfied_signals); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, state.satisfiable_signals); |
@@ -188,18 +179,14 @@ TEST(CoreTest, BasicDataPipe) { |
// The consumer |hc| shouldn't be readable. |
MojoHandleSignalsState state; |
- EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, |
- MojoWait(hc, MOJO_HANDLE_SIGNAL_READABLE, 0, &state)); |
- |
+ EXPECT_EQ(MOJO_RESULT_OK, MojoQueryHandleSignalsState(hc, &state)); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_NONE, state.satisfied_signals); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_PEER_CLOSED | |
MOJO_HANDLE_SIGNAL_NEW_DATA_READABLE, |
state.satisfiable_signals); |
// The producer |hp| should be writable. |
- EXPECT_EQ(MOJO_RESULT_OK, |
- MojoWait(hp, MOJO_HANDLE_SIGNAL_WRITABLE, 0, &state)); |
- |
+ EXPECT_EQ(MOJO_RESULT_OK, MojoQueryHandleSignalsState(hp, &state)); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, state.satisfied_signals); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE | MOJO_HANDLE_SIGNAL_PEER_CLOSED, |
state.satisfiable_signals); |
@@ -276,7 +263,8 @@ TEST(CoreTest, BasicDataPipe) { |
// |hc| should no longer be readable. |
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, |
- MojoWait(hc, MOJO_HANDLE_SIGNAL_READABLE, 1000, &state)); |
+ MojoWait(hc, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, |
+ &state)); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, state.satisfied_signals); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, state.satisfiable_signals); |