Clarified Subprocess PIPE usage in Subprocess tests. Review: https://reviews.apache.org/r/41320
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6eb2f98b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6eb2f98b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6eb2f98b Branch: refs/heads/master Commit: 6eb2f98b3f4f770319a63da31459459628b48b46 Parents: 3fb0801 Author: Benjamin Mahler <[email protected]> Authored: Sat Dec 12 11:07:22 2015 -0800 Committer: Benjamin Mahler <[email protected]> Committed: Sun Dec 13 11:30:48 2015 -0800 ---------------------------------------------------------------------- .../libprocess/src/tests/subprocess_tests.cpp | 76 ++++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6eb2f98b/3rdparty/libprocess/src/tests/subprocess_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/subprocess_tests.cpp b/3rdparty/libprocess/src/tests/subprocess_tests.cpp index 869b920..8f0a313 100644 --- a/3rdparty/libprocess/src/tests/subprocess_tests.cpp +++ b/3rdparty/libprocess/src/tests/subprocess_tests.cpp @@ -143,9 +143,9 @@ TEST_F(SubprocessTest, PipeOutput) // Standard out. Try<Subprocess> s = subprocess( "echo hello", + Subprocess::FD(STDIN_FILENO), Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE()); + Subprocess::FD(STDERR_FILENO)); ASSERT_SOME(s); ASSERT_SOME(s.get().out()); @@ -169,8 +169,8 @@ TEST_F(SubprocessTest, PipeOutput) // Standard error. s = subprocess( "echo hello 1>&2", - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), + Subprocess::FD(STDOUT_FILENO), Subprocess::PIPE()); ASSERT_SOME(s); @@ -200,7 +200,7 @@ TEST_F(SubprocessTest, PipeInput) "read word ; echo $word", Subprocess::PIPE(), Subprocess::PIPE(), - Subprocess::PIPE()); + Subprocess::FD(STDERR_FILENO)); ASSERT_SOME(s); ASSERT_SOME(s.get().in()); @@ -230,9 +230,9 @@ TEST_F(SubprocessTest, PipeRedirect) { Try<Subprocess> s = subprocess( "echo 'hello world'", + Subprocess::FD(STDIN_FILENO), Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE()); + Subprocess::FD(STDERR_FILENO)); ASSERT_SOME(s); @@ -284,9 +284,9 @@ TEST_F(SubprocessTest, PathOutput) // Standard out. Try<Subprocess> s = subprocess( "echo hello", - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), Subprocess::PATH(out), - Subprocess::PIPE()); + Subprocess::FD(STDERR_FILENO)); ASSERT_SOME(s); @@ -312,8 +312,8 @@ TEST_F(SubprocessTest, PathOutput) // Standard error. s = subprocess( "echo hello 1>&2", - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), + Subprocess::FD(STDOUT_FILENO), Subprocess::PATH(err)); ASSERT_SOME(s); @@ -349,7 +349,7 @@ TEST_F(SubprocessTest, PathInput) "read word ; echo $word", Subprocess::PATH(in), Subprocess::PIPE(), - Subprocess::PIPE()); + Subprocess::FD(STDERR_FILENO)); ASSERT_SOME(s); ASSERT_SOME(s.get().out()); @@ -387,9 +387,9 @@ TEST_F(SubprocessTest, FdOutput) Try<Subprocess> s = subprocess( "echo hello", - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), Subprocess::FD(outFd.get()), - Subprocess::PIPE()); + Subprocess::FD(STDERR_FILENO)); ASSERT_SOME(os::close(outFd.get())); ASSERT_SOME(s); @@ -423,8 +423,8 @@ TEST_F(SubprocessTest, FdOutput) s = subprocess( "echo hello 1>&2", - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), + Subprocess::FD(STDOUT_FILENO), Subprocess::FD(errFd.get())); ASSERT_SOME(os::close(errFd.get())); @@ -464,7 +464,7 @@ TEST_F(SubprocessTest, FdInput) "read word ; echo $word", Subprocess::FD(inFd.get()), Subprocess::PIPE(), - Subprocess::PIPE()); + Subprocess::FD(STDERR_FILENO)); ASSERT_SOME(os::close(inFd.get())); @@ -571,9 +571,9 @@ TEST_F(SubprocessTest, Flags) Try<Subprocess> s = subprocess( "/bin/echo", vector<string>(1, "echo"), - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), Subprocess::PATH(out), - Subprocess::PIPE(), + Subprocess::FD(STDERR_FILENO), flags); ASSERT_SOME(s); @@ -635,9 +635,9 @@ TEST_F(SubprocessTest, Environment) Try<Subprocess> s = subprocess( "echo $MESSAGE", + Subprocess::FD(STDIN_FILENO), Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDERR_FILENO), environment); ASSERT_SOME(s); @@ -666,9 +666,9 @@ TEST_F(SubprocessTest, Environment) s = subprocess( "echo $MESSAGE0 $MESSAGE1", + Subprocess::FD(STDIN_FILENO), Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDERR_FILENO), environment); ASSERT_SOME(s); @@ -700,9 +700,9 @@ TEST_F(SubprocessTest, EnvironmentWithSpaces) Try<Subprocess> s = subprocess( "echo $MESSAGE", + Subprocess::FD(STDIN_FILENO), Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDERR_FILENO), environment); ASSERT_SOME(s); @@ -734,9 +734,9 @@ TEST_F(SubprocessTest, EnvironmentWithSpacesAndQuotes) Try<Subprocess> s = subprocess( "echo $MESSAGE", + Subprocess::FD(STDIN_FILENO), Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDERR_FILENO), environment); ASSERT_SOME(s); @@ -771,9 +771,9 @@ TEST_F(SubprocessTest, EnvironmentOverride) Try<Subprocess> s = subprocess( "echo $MESSAGE1 $MESSAGE2", + Subprocess::FD(STDIN_FILENO), Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDERR_FILENO), environment); ASSERT_SOME(s); @@ -816,9 +816,9 @@ TEST_F(SubprocessTest, Setup) // chdir(). Try<Subprocess> s = subprocess( "echo hello world > file", - Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), + Subprocess::FD(STDOUT_FILENO), + Subprocess::FD(STDERR_FILENO), None(), lambda::bind(&setupChdir, directory.get())); @@ -855,9 +855,9 @@ TEST_F(SubprocessTest, SetupStatus) // Exit 0 && setup 1. Try<Subprocess> s = subprocess( "exit 0", - Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), + Subprocess::FD(STDOUT_FILENO), + Subprocess::FD(STDERR_FILENO), None(), lambda::bind(&setupStatus, 1)); @@ -883,9 +883,9 @@ TEST_F(SubprocessTest, SetupStatus) // Exit 1 && setup 0. s = subprocess( "exit 1", - Subprocess::PIPE(), - Subprocess::PIPE(), - Subprocess::PIPE(), + Subprocess::FD(STDIN_FILENO), + Subprocess::FD(STDOUT_FILENO), + Subprocess::FD(STDERR_FILENO), None(), lambda::bind(&setupStatus, 0));
