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

Unified Diff: base/process_util_unittest.cc

Issue 42224: This should make ProcessUtilTest.KillSlowChild not-flaky. (Closed)
Patch Set: Created 11 years, 9 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process_util_unittest.cc
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 578ac3f9b319127c57eb6d054ba616a29dc5b4b0..acb60e046e7ab98dabe99b973a3262156c4d820a 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -50,22 +50,13 @@ MULTIPROCESS_TEST_MAIN(SlowChildProcess) {
return 0;
}
-#if defined(OS_WIN)
-#define EXE_SUFFIX L".exe"
-#else
-#define EXE_SUFFIX L""
-#endif
-
TEST_F(ProcessUtilTest, KillSlowChild) {
remove("SlowChildProcess.die");
- int oldcount = GetProcessCount(L"base_unittests" EXE_SUFFIX, 0);
ProcessHandle handle = this->SpawnChild(L"SlowChildProcess");
ASSERT_NE(static_cast<ProcessHandle>(NULL), handle);
- EXPECT_EQ(oldcount+1, GetProcessCount(L"base_unittests" EXE_SUFFIX, 0));
FILE *fp = fopen("SlowChildProcess.die", "w");
fclose(fp);
EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
- EXPECT_EQ(oldcount, GetProcessCount(L"base_unittests" EXE_SUFFIX, 0));
base::CloseProcessHandle(handle);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698