summaryrefslogtreecommitdiffstats
path: root/mojo/edk/test/multiprocess_test_helper_unittest.cc
diff options
context:
space:
mode:
authorviettrungluu <viettrungluu@chromium.org>2014-10-07 16:13:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 23:14:30 +0000
commitb247579e8a2339c59884aa4b5ef3dcb00d9aa9f8 (patch)
tree3d2340dd1903ea27a1de9baf6193b1d08285feb2 /mojo/edk/test/multiprocess_test_helper_unittest.cc
parent50137f21d45d13fb3467959635ceac2a033c2eb3 (diff)
downloadchromium_src-b247579e8a2339c59884aa4b5ef3dcb00d9aa9f8.zip
chromium_src-b247579e8a2339c59884aa4b5ef3dcb00d9aa9f8.tar.gz
chromium_src-b247579e8a2339c59884aa4b5ef3dcb00d9aa9f8.tar.bz2
Mojo: Combine mojo/edk/{system,embedder}/PRESUBMIT.py.
Instead, have a mojo/edk/PRESUBMIT.py. Format mojo/edk/test/. Also reformat mojo/edk/{system,embedder}/ (to match current clang-format output). R=sky@chromium.org Review URL: https://codereview.chromium.org/633263002 Cr-Commit-Position: refs/heads/master@{#298603}
Diffstat (limited to 'mojo/edk/test/multiprocess_test_helper_unittest.cc')
-rw-r--r--mojo/edk/test/multiprocess_test_helper_unittest.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/mojo/edk/test/multiprocess_test_helper_unittest.cc b/mojo/edk/test/multiprocess_test_helper_unittest.cc
index ec2ba22..2961a74 100644
--- a/mojo/edk/test/multiprocess_test_helper_unittest.cc
+++ b/mojo/edk/test/multiprocess_test_helper_unittest.cc
@@ -118,8 +118,8 @@ TEST_F(MultiprocessTestHelperTest, ChildTestPasses) {
MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestPasses) {
ASSERT_TRUE(MultiprocessTestHelper::client_platform_handle.is_valid());
- EXPECT_TRUE(IsNonBlocking(
- MultiprocessTestHelper::client_platform_handle.get()));
+ EXPECT_TRUE(
+ IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get()));
}
TEST_F(MultiprocessTestHelperTest, ChildTestFailsAssert) {
@@ -132,8 +132,9 @@ TEST_F(MultiprocessTestHelperTest, ChildTestFailsAssert) {
MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestFailsAssert) {
ASSERT_FALSE(MultiprocessTestHelper::client_platform_handle.is_valid())
<< "DISREGARD: Expected failure in child process";
- ASSERT_FALSE(IsNonBlocking(
- MultiprocessTestHelper::client_platform_handle.get())) << "Not reached";
+ ASSERT_FALSE(
+ IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get()))
+ << "Not reached";
CHECK(false) << "Not reached";
}
@@ -147,8 +148,8 @@ TEST_F(MultiprocessTestHelperTest, ChildTestFailsExpect) {
MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestFailsExpect) {
EXPECT_FALSE(MultiprocessTestHelper::client_platform_handle.is_valid())
<< "DISREGARD: Expected failure #1 in child process";
- EXPECT_FALSE(IsNonBlocking(
- MultiprocessTestHelper::client_platform_handle.get()))
+ EXPECT_FALSE(
+ IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get()))
<< "DISREGARD: Expected failure #2 in child process";
}