Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Unified Diff: base/files/file_locking_unittest.cc

Issue 2549363004: Multiprocess test client: Android child process launcher rework. (Closed)
Patch Set: Fixed tests Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/files/file_locking_unittest.cc
diff --git a/base/files/file_locking_unittest.cc b/base/files/file_locking_unittest.cc
index beb93998c4c672ea5d3fb5ad9495e33a6e693eda..b709b7536c4ad87f9bd4984a7e2d4dbe9bb338ad 100644
--- a/base/files/file_locking_unittest.cc
+++ b/base/files/file_locking_unittest.cc
@@ -165,8 +165,8 @@ class FileLockingTest : public testing::Test {
void ExitChildCleanly() {
ASSERT_TRUE(SignalEvent(kSignalExit));
int rv = -1;
- ASSERT_TRUE(lock_child_.WaitForExitWithTimeout(
- TestTimeouts::action_timeout(), &rv));
+ ASSERT_TRUE(WaitForMultiprocessTestChildExit(
+ lock_child_, TestTimeouts::action_timeout(), &rv));
ASSERT_EQ(0, rv);
}
@@ -220,7 +220,7 @@ TEST_F(FileLockingTest, UnlockOnTerminate) {
StartChildAndSignalLock(kExitUnlock);
ASSERT_NE(File::FILE_OK, lock_file_.Lock());
- ASSERT_TRUE(lock_child_.Terminate(0, true));
+ ASSERT_TRUE(TerminateMultiProcessTestChild(lock_child_, 0, true));
ASSERT_EQ(File::FILE_OK, lock_file_.Lock());
ASSERT_EQ(File::FILE_OK, lock_file_.Unlock());
}

Powered by Google App Engine
This is Rietveld 408576698