diff options
author | Alex Deymo <deymo@google.com> | 2016-04-05 23:00:52 +0000 |
---|---|---|
committer | Alex Deymo <deymo@google.com> | 2016-04-05 23:01:20 +0000 |
commit | 109c28d570e1259c3d58e711826f8f22afc9e2f4 (patch) | |
tree | 323b0577ca6767d0e39fec74067bb2f32d5d1ea1 /common/subprocess_unittest.cc | |
parent | 20e3960e245f6dfa57fa5c9124b0fd33e679f723 (diff) |
Revert "Make transition to "postinstall" domain explicit."
This reverts commit 20e3960e245f6dfa57fa5c9124b0fd33e679f723.
Bug: 28008031
Change-Id: If5fcb949dee91779bea465793ec2b333d27a704e
Diffstat (limited to 'common/subprocess_unittest.cc')
-rw-r--r-- | common/subprocess_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/subprocess_unittest.cc b/common/subprocess_unittest.cc index d5e33bba..5ca44e80 100644 --- a/common/subprocess_unittest.cc +++ b/common/subprocess_unittest.cc @@ -148,7 +148,6 @@ TEST_F(SubprocessTest, StderrNotIncludedInOutputTest) { {kBinPath "/sh", "-c", "echo on stdout; echo on stderr >&2"}, 0, {}, - nullptr, base::Bind(&ExpectedResults, 0, "on stdout\n"))); loop_.Run(); } @@ -159,7 +158,6 @@ TEST_F(SubprocessTest, PipeRedirectFdTest) { {kBinPath "/sh", "-c", "echo on pipe >&3"}, 0, {3}, - nullptr, base::Bind(&ExpectedDataOnPipe, &subprocess_, &pid, 3, "on pipe\n", 0)); EXPECT_NE(0, pid); @@ -176,7 +174,10 @@ TEST_F(SubprocessTest, PipeClosedWhenNotRedirectedTest) { const vector<string> cmd = {kBinPath "/sh", "-c", base::StringPrintf("echo on pipe >/proc/self/fd/%d", pipe.writer)}; EXPECT_TRUE(subprocess_.ExecFlags( - cmd, 0, {}, nullptr, base::Bind(&ExpectedResults, 1, ""))); + cmd, + 0, + {}, + base::Bind(&ExpectedResults, 1, ""))); loop_.Run(); } |