diff options
| author | Amin Hassani <ahassani@chromium.org> | 2020-09-16 11:19:28 -0700 |
|---|---|---|
| committer | Amin Hassani <ahassani@chromium.org> | 2020-09-17 10:17:36 -0700 |
| commit | e53b39b8b9c5c0871841bbbb86f23657c0b7f91b (patch) | |
| tree | 12746e5e7e4716ba7fc94d3ed5c1a36c4d47d474 /common/subprocess_unittest.cc | |
| parent | a02a1f1dc837f22226499d9856a949fb180d099a (diff) | |
| parent | 9956320ffa4edb340d20bd7f3c852a9e87437bd3 (diff) | |
update_engine: Merge remote-tracking branch 'cros/upstream' into cros/master
Done with:
git merge cros/upstream --commit -s recursive
- Added EC key support and its unittests.
- Resolved a conlict on error codes. Since Android versions are not
uploading any UMA metrics, I gave the priority to the Android version
Since they can't be changed.
- Changed the openssl functions to get1 version (from get0) version
because of a current issue with gale. Once the issue is resolved we
need to change them back.
- Some remaining styling issues fixed by clang-format
BUG=b:163153182
TEST=CQ passes
TEST=unittests
Change-Id: Ib95034422b92433ce26e28336bc4806b34910d38
Diffstat (limited to 'common/subprocess_unittest.cc')
| -rw-r--r-- | common/subprocess_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/subprocess_unittest.cc b/common/subprocess_unittest.cc index 19b24f45..b4d068f0 100644 --- a/common/subprocess_unittest.cc +++ b/common/subprocess_unittest.cc @@ -279,7 +279,7 @@ TEST_F(SubprocessTest, CancelTest) { // This test would leak a callback that runs when the child process exits // unless we wait for it to run. brillo::MessageLoopRunUntil( - &loop_, TimeDelta::FromSeconds(120), base::Bind([] { + &loop_, TimeDelta::FromSeconds(20), base::Bind([] { return Subprocess::Get().subprocess_records_.empty(); })); EXPECT_TRUE(Subprocess::Get().subprocess_records_.empty()); |