Index: util/test/multiprocess_test.cc |
diff --git a/util/test/multiprocess_test.cc b/util/test/multiprocess_test.cc |
index 167f6475d4661bbcaba7bd6ca35e09d56a381f80..aab0181b1f1e40260b38585e00cee268131b4100 100644 |
--- a/util/test/multiprocess_test.cc |
+++ b/util/test/multiprocess_test.cc |
@@ -21,7 +21,6 @@ |
#include "base/basictypes.h" |
#include "gtest/gtest.h" |
#include "util/file/fd_io.h" |
-#include "util/test/errors.h" |
namespace { |
@@ -38,40 +37,31 @@ class TestMultiprocess final : public Multiprocess { |
virtual void MultiprocessParent() override { |
int read_fd = ReadPipeFD(); |
char c; |
- ssize_t rv = ReadFD(read_fd, &c, 1); |
- ASSERT_EQ(1, rv) << ErrnoMessage("read"); |
+ CheckedReadFD(read_fd, &c, 1); |
EXPECT_EQ('M', c); |
pid_t pid; |
- rv = ReadFD(read_fd, &pid, sizeof(pid)); |
- ASSERT_EQ(static_cast<ssize_t>(sizeof(pid)), rv) << ErrnoMessage("read"); |
+ CheckedReadFD(read_fd, &pid, sizeof(pid)); |
EXPECT_EQ(pid, ChildPID()); |
- int write_fd = WritePipeFD(); |
c = 'm'; |
- rv = WriteFD(write_fd, &c, 1); |
- ASSERT_EQ(1, rv) << ErrnoMessage("write"); |
+ CheckedWriteFD(WritePipeFD(), &c, 1); |
// The child will close its end of the pipe and exit. Make sure that the |
// parent sees EOF. |
- rv = ReadFD(read_fd, &c, 1); |
- ASSERT_EQ(0, rv) << ErrnoMessage("read"); |
+ CheckedReadFDAtEOF(read_fd); |
} |
virtual void MultiprocessChild() override { |
int write_fd = WritePipeFD(); |
char c = 'M'; |
- ssize_t rv = WriteFD(write_fd, &c, 1); |
- ASSERT_EQ(1, rv) << ErrnoMessage("write"); |
+ CheckedWriteFD(write_fd, &c, 1); |
pid_t pid = getpid(); |
- rv = WriteFD(write_fd, &pid, sizeof(pid)); |
- ASSERT_EQ(static_cast<ssize_t>(sizeof(pid)), rv) << ErrnoMessage("write"); |
+ CheckedWriteFD(write_fd, &pid, sizeof(pid)); |
- int read_fd = ReadPipeFD(); |
- rv = ReadFD(read_fd, &c, 1); |
- ASSERT_EQ(1, rv) << ErrnoMessage("read"); |
+ CheckedReadFD(ReadPipeFD(), &c, 1); |
EXPECT_EQ('m', c); |
} |