Use distinguished exit status for unittests.
* Enabled a parametric exit status in Terminator::Exit().
* The unittest binary sets this exit status to 2, to distinguish it from
other exit(1) calls in the code base.
BUG=chromium-os:29841
TEST=Build, passes unit tests.
Change-Id: I2bf6a834743e513a647ed7bb2266ef095064d6bc
Reviewed-on: https://gerrit.chromium.org/gerrit/21479
Reviewed-by: Don Garrett <[email protected]>
Commit-Ready: Gilad Arnold <[email protected]>
Reviewed-by: Gilad Arnold <[email protected]>
Tested-by: Gilad Arnold <[email protected]>
diff --git a/terminator_unittest.cc b/terminator_unittest.cc
index b0f4191..68d4d13 100644
--- a/terminator_unittest.cc
+++ b/terminator_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -34,7 +34,7 @@
}
void RaiseSIGTERM() {
- ASSERT_EXIT(raise(SIGTERM), ExitedWithCode(1), "");
+ ASSERT_EXIT(raise(SIGTERM), ExitedWithCode(2), "");
}
} // namespace {}
@@ -54,9 +54,9 @@
}
TEST_F(TerminatorDeathTest, ExitTest) {
- ASSERT_EXIT(Terminator::Exit(), ExitedWithCode(1), "");
+ ASSERT_EXIT(Terminator::Exit(), ExitedWithCode(2), "");
Terminator::set_exit_blocked(true);
- ASSERT_EXIT(Terminator::Exit(), ExitedWithCode(1), "");
+ ASSERT_EXIT(Terminator::Exit(), ExitedWithCode(2), "");
}
TEST_F(TerminatorDeathTest, RaiseSignalTest) {
@@ -68,7 +68,7 @@
TEST_F(TerminatorDeathTest, ScopedTerminatorExitUnblockerExitTest) {
Terminator::set_exit_blocked(true);
Terminator::exit_requested_ = 1;
- ASSERT_EXIT(UnblockExitThroughUnblocker(), ExitedWithCode(1), "");
+ ASSERT_EXIT(UnblockExitThroughUnblocker(), ExitedWithCode(2), "");
}
} // namespace chromeos_update_engine
