Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2964)

Unified Diff: chrome/installer/util/install_util_unittest.cc

Issue 2692843002: Fail tests fast if overriding the Windows registry fails. (Closed)
Patch Set: sync to position 450085 Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/install_util_unittest.cc
diff --git a/chrome/installer/util/install_util_unittest.cc b/chrome/installer/util/install_util_unittest.cc
index eb962a462df4aaf61725f07170e89c452ba8effe..ad1fbff7a30d68c8e11d5e8d01193c588f410421 100644
--- a/chrome/installer/util/install_util_unittest.cc
+++ b/chrome/installer/util/install_util_unittest.cc
@@ -47,15 +47,15 @@ class InstallUtilTest : public testing::Test {
protected:
InstallUtilTest() {}
- void SetUp() override {
- ResetRegistryOverrides();
- }
+ void SetUp() override { ASSERT_NO_FATAL_FAILURE(ResetRegistryOverrides()); }
void ResetRegistryOverrides() {
registry_override_manager_.reset(
new registry_util::RegistryOverrideManager);
- registry_override_manager_->OverrideRegistry(HKEY_CURRENT_USER);
- registry_override_manager_->OverrideRegistry(HKEY_LOCAL_MACHINE);
+ ASSERT_NO_FATAL_FAILURE(
+ registry_override_manager_->OverrideRegistry(HKEY_CURRENT_USER));
+ ASSERT_NO_FATAL_FAILURE(
+ registry_override_manager_->OverrideRegistry(HKEY_LOCAL_MACHINE));
}
private:
@@ -207,7 +207,7 @@ TEST_F(InstallUtilTest, DeleteRegistryValueIf) {
const wchar_t value[] = L"hi mom";
{
- ResetRegistryOverrides();
+ ASSERT_NO_FATAL_FAILURE(ResetRegistryOverrides());
// Nothing to delete if the key isn't even there.
{
MockRegistryValuePredicate pred;
@@ -270,7 +270,7 @@ TEST_F(InstallUtilTest, DeleteRegistryValueIf) {
}
{
- ResetRegistryOverrides();
+ ASSERT_NO_FATAL_FAILURE(ResetRegistryOverrides());
// Default value matches: delete using empty string.
{
MockRegistryValuePredicate pred;
@@ -290,7 +290,7 @@ TEST_F(InstallUtilTest, DeleteRegistryValueIf) {
}
{
- ResetRegistryOverrides();
+ ASSERT_NO_FATAL_FAILURE(ResetRegistryOverrides());
// Default value matches: delete using NULL.
{
MockRegistryValuePredicate pred;
« no previous file with comments | « chrome/installer/util/google_update_settings_unittest.cc ('k') | chrome/installer/util/product_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698