Changing multiprocess test SpawnChild to return a struct.

base/process/process_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 142 matching lines @@
   return tmp_dir.value();
 #endif
 }
 
 MULTIPROCESS_TEST_MAIN(SimpleChildProcess) {
   return kSuccess;
 }
 
 // TODO(viettrungluu): This should be in a "MultiProcessTestTest".
 TEST_F(ProcessUtilTest, SpawnChild) {
-  base::Process process = SpawnChild("SimpleChildProcess");
+  base::SpawnChildResult spawn_result = SpawnChild("SimpleChildProcess");
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
   int exit_code;
   EXPECT_TRUE(process.WaitForExitWithTimeout(
                   TestTimeouts::action_max_timeout(), &exit_code));
 }
 
 MULTIPROCESS_TEST_MAIN(SlowChildProcess) {
   WaitToDie(ProcessUtilTest::GetSignalFilePath(kSignalFileSlow).c_str());
   return kSuccess;
 }
 
 TEST_F(ProcessUtilTest, KillSlowChild) {
   const std::string signal_file =
       ProcessUtilTest::GetSignalFilePath(kSignalFileSlow);
   remove(signal_file.c_str());
-  base::Process process = SpawnChild("SlowChildProcess");
+  base::SpawnChildResult spawn_result = SpawnChild("SlowChildProcess");
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
   SignalChildren(signal_file.c_str());
   int exit_code;
   EXPECT_TRUE(process.WaitForExitWithTimeout(
                   TestTimeouts::action_max_timeout(), &exit_code));
   remove(signal_file.c_str());
 }
 
 // Times out on Linux and Win, flakes on other platforms, http://crbug.com/95058
 TEST_F(ProcessUtilTest, DISABLED_GetTerminationStatusExit) {
   const std::string signal_file =
       ProcessUtilTest::GetSignalFilePath(kSignalFileSlow);
   remove(signal_file.c_str());
-  base::Process process = SpawnChild("SlowChildProcess");
+  base::SpawnChildResult spawn_result = SpawnChild("SlowChildProcess");
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
 
   int exit_code = 42;
   EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING,
             base::GetTerminationStatus(process.Handle(), &exit_code));
   EXPECT_EQ(kExpectedStillRunningExitCode, exit_code);
 
   SignalChildren(signal_file.c_str());
   exit_code = 42;
   base::TerminationStatus status =
@@ skipping 24 matching lines @@
 
 TEST_F(ProcessUtilTest, CurrentDirectory) {
   // TODO(rickyz): Add support for passing arguments to multiprocess children,
   // then create a special directory for this test.
   base::FilePath tmp_dir;
   ASSERT_TRUE(base::GetTempDir(&tmp_dir));
 
   base::LaunchOptions options;
   options.current_directory = tmp_dir;
 
-  base::Process process(SpawnChildWithOptions("CheckCwdProcess", options));
+  base::SpawnChildResult spawn_result =
+      SpawnChildWithOptions("CheckCwdProcess", options);
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
 
   int exit_code = 42;
   EXPECT_TRUE(process.WaitForExit(&exit_code));
   EXPECT_EQ(kSuccess, exit_code);
 }
 #endif  // !defined(OS_ANDROID)
 
 #if defined(OS_WIN)
 // TODO(cpu): figure out how to test this in other platforms.
 TEST_F(ProcessUtilTest, GetProcId) {
   base::ProcessId id1 = base::GetProcId(GetCurrentProcess());
   EXPECT_NE(0ul, id1);
-  base::Process process = SpawnChild("SimpleChildProcess");
+  base::SpawnChildResult spawn_result = SpawnChild("SimpleChildProcess");
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
   base::ProcessId id2 = process.Pid();
   EXPECT_NE(0ul, id2);
   EXPECT_NE(id1, id2);
 }
 #endif  // defined(OS_WIN)
 
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 // This test is disabled on Mac, since it's flaky due to ReportCrash
 // taking a variable amount of time to parse and load the debug and
@@ skipping 25 matching lines @@
 // AddressSanitizer.
 #if defined(ADDRESS_SANITIZER) || defined(SYZYASAN)
 #define MAYBE_GetTerminationStatusCrash DISABLED_GetTerminationStatusCrash
 #else
 #define MAYBE_GetTerminationStatusCrash GetTerminationStatusCrash
 #endif
 TEST_F(ProcessUtilTest, MAYBE_GetTerminationStatusCrash) {
   const std::string signal_file =
     ProcessUtilTest::GetSignalFilePath(kSignalFileCrash);
   remove(signal_file.c_str());
-  base::Process process = SpawnChild("CrashingChildProcess");
+  base::SpawnChildResult spawn_result = SpawnChild("CrashingChildProcess");
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
 
   int exit_code = 42;
   EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING,
             base::GetTerminationStatus(process.Handle(), &exit_code));
   EXPECT_EQ(kExpectedStillRunningExitCode, exit_code);
 
   SignalChildren(signal_file.c_str());
   exit_code = 42;
   base::TerminationStatus status =
@@ skipping 34 matching lines @@
   // Send a SIGTERM to this process.
   ::kill(getpid(), SIGTERM);
   return 1;
 }
 #endif  // defined(OS_POSIX)
 
 TEST_F(ProcessUtilTest, GetTerminationStatusSigKill) {
   const std::string signal_file =
     ProcessUtilTest::GetSignalFilePath(kSignalFileKill);
   remove(signal_file.c_str());
-  base::Process process = SpawnChild("KilledChildProcess");
+  base::SpawnChildResult spawn_result = SpawnChild("KilledChildProcess");
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
 
   int exit_code = 42;
   EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING,
             base::GetTerminationStatus(process.Handle(), &exit_code));
   EXPECT_EQ(kExpectedStillRunningExitCode, exit_code);
 
   SignalChildren(signal_file.c_str());
   exit_code = 42;
   base::TerminationStatus status =
@@ skipping 13 matching lines @@
   EXPECT_EQ(SIGKILL, signal);
 #endif
   remove(signal_file.c_str());
 }
 
 #if defined(OS_POSIX)
 TEST_F(ProcessUtilTest, GetTerminationStatusSigTerm) {
   const std::string signal_file =
     ProcessUtilTest::GetSignalFilePath(kSignalFileTerm);
   remove(signal_file.c_str());
-  base::Process process = SpawnChild("TerminatedChildProcess");
+  base::SpawnChildResult spawn_result = SpawnChild("TerminatedChildProcess");
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
 
   int exit_code = 42;
   EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING,
             base::GetTerminationStatus(process.Handle(), &exit_code));
   EXPECT_EQ(kExpectedStillRunningExitCode, exit_code);
 
   SignalChildren(signal_file.c_str());
   exit_code = 42;
   base::TerminationStatus status =
@@ skipping 222 matching lines @@
 
 int ProcessUtilTest::CountOpenFDsInChild() {
   int fds[2];
   if (pipe(fds) < 0)
     NOTREACHED();
 
   base::FileHandleMappingVector fd_mapping_vec;
   fd_mapping_vec.push_back(std::pair<int, int>(fds[1], kChildPipe));
   base::LaunchOptions options;
   options.fds_to_remap = &fd_mapping_vec;
-  base::Process process =
+  base::SpawnChildResult spawn_result =
       SpawnChildWithOptions("ProcessUtilsLeakFDChildProcess", options);
+  base::Process process = std::move(spawn_result.process);
   CHECK(process.IsValid());
   int ret = IGNORE_EINTR(close(fds[1]));
   DPCHECK(ret == 0);
 
   // Read number of open files in client process from pipe;
   int num_open_files = -1;
   ssize_t bytes_read =
       HANDLE_EINTR(read(fds[0], &num_open_files, sizeof(num_open_files)));
   CHECK_EQ(bytes_read, static_cast<ssize_t>(sizeof(num_open_files)));
 
@@ skipping 220 matching lines @@
 // TODO(port): port those unit tests.
 bool IsProcessDead(base::ProcessHandle child) {
   // waitpid() will actually reap the process which is exactly NOT what we
   // want to test for.  The good thing is that if it can't find the process
   // we'll get a nice value for errno which we can test for.
   const pid_t result = HANDLE_EINTR(waitpid(child, NULL, WNOHANG));
   return result == -1 && errno == ECHILD;
 }
 
 TEST_F(ProcessUtilTest, DelayedTermination) {
-  base::Process child_process = SpawnChild("process_util_test_never_die");
+  base::SpawnChildResult spawn_result =
+      SpawnChild("process_util_test_never_die");
+  base::Process child_process = std::move(spawn_result.process);
   ASSERT_TRUE(child_process.IsValid());
   base::EnsureProcessTerminated(child_process.Duplicate());
   int exit_code;
   child_process.WaitForExitWithTimeout(base::TimeDelta::FromSeconds(5),
                                        &exit_code);
 
   // Check that process was really killed.
   EXPECT_TRUE(IsProcessDead(child_process.Handle()));
 }
 
 MULTIPROCESS_TEST_MAIN(process_util_test_never_die) {
   while (1) {
     sleep(500);
   }
   return kSuccess;
 }
 
 TEST_F(ProcessUtilTest, ImmediateTermination) {
-  base::Process child_process = SpawnChild("process_util_test_die_immediately");
+  base::SpawnChildResult spawn_result =
+      SpawnChild("process_util_test_die_immediately");
+  base::Process child_process = std::move(spawn_result.process);
   ASSERT_TRUE(child_process.IsValid());
   // Give it time to die.
   sleep(2);
   base::EnsureProcessTerminated(child_process.Duplicate());
 
   // Check that process was really killed.
   EXPECT_TRUE(IsProcessDead(child_process.Handle()));
 }
 
 MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately) {
@@ skipping 25 matching lines @@
 
   base::ScopedFD read_fd(pipe_fds[0]);
   base::ScopedFD write_fd(pipe_fds[1]);
   base::FileHandleMappingVector fds_to_remap;
   fds_to_remap.push_back(std::make_pair(read_fd.get(), read_fd.get()));
 
   ReadFromPipeDelegate read_from_pipe_delegate(read_fd.get());
   base::LaunchOptions options;
   options.fds_to_remap = &fds_to_remap;
   options.pre_exec_delegate = &read_from_pipe_delegate;
-  base::Process process(SpawnChildWithOptions("SimpleChildProcess", options));
+  base::SpawnChildResult spawn_result =
+      SpawnChildWithOptions("SimpleChildProcess", options);
+  base::Process process(std::move(spawn_result.process));
   ASSERT_TRUE(process.IsValid());
 
   read_fd.reset();
   ASSERT_EQ(1, HANDLE_EINTR(write(write_fd.get(), &kPipeValue, 1)));
 
   int exit_code = 42;
   EXPECT_TRUE(process.WaitForExit(&exit_code));
   EXPECT_EQ(0, exit_code);
 }
 #endif  // !defined(OS_ANDROID)
@@ skipping 14 matching lines @@
   if (RunningOnValgrind() ||
       !base::PathExists(FilePath("/proc/self/ns/user")) ||
       !base::PathExists(FilePath("/proc/self/ns/pid"))) {
     // User or PID namespaces are not supported.
     return;
   }
 
   base::LaunchOptions options;
   options.clone_flags = CLONE_NEWUSER | CLONE_NEWPID;
 
-  base::Process process(SpawnChildWithOptions("CheckPidProcess", options));
+  base::SpawnChildResult spawn_result =
+      SpawnChildWithOptions("CheckPidProcess", options);
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
 
   int exit_code = 42;
   EXPECT_TRUE(process.WaitForExit(&exit_code));
   EXPECT_EQ(kSuccess, exit_code);
 }
 #endif  // defined(CLONE_NEWUSER) && defined(CLONE_NEWPID)
 
 TEST(ForkWithFlagsTest, UpdatesPidCache) {
   // The libc clone function, which allows ForkWithFlags to keep the pid cache
@@ skipping 20 matching lines @@
   int status = 42;
   ASSERT_EQ(pid, HANDLE_EINTR(waitpid(pid, &status, 0)));
   ASSERT_TRUE(WIFEXITED(status));
   EXPECT_EQ(kSuccess, WEXITSTATUS(status));
 }
 
 TEST_F(ProcessUtilTest, InvalidCurrentDirectory) {
   base::LaunchOptions options;
   options.current_directory = base::FilePath("/dev/null");
 
-  base::Process process(SpawnChildWithOptions("SimpleChildProcess", options));
+  base::SpawnChildResult spawn_result =
+      SpawnChildWithOptions("SimpleChildProcess", options);
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());
 
   int exit_code = kSuccess;
   EXPECT_TRUE(process.WaitForExit(&exit_code));
   EXPECT_NE(kSuccess, exit_code);
 }
 #endif  // defined(OS_LINUX)