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

Unified Diff: chrome/installer/util/beacons_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/beacons_unittest.cc
diff --git a/chrome/installer/util/beacons_unittest.cc b/chrome/installer/util/beacons_unittest.cc
index a8d93ad20772e43a0c9434ccef33bfc50a1d0394..1ca2a8ad801b29cbc56dc81a384c607be68a21df 100644
--- a/chrome/installer/util/beacons_unittest.cc
+++ b/chrome/installer/util/beacons_unittest.cc
@@ -41,10 +41,14 @@ class BeaconTest : public ::testing::TestWithParam<
beacon_type_,
beacon_scope_,
system_install_,
- app_registration_data_) {
+ app_registration_data_) {}
+
+ void SetUp() override {
// Override the registry so that tests can freely push state to it.
- 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));
}
TestAppRegistrationData app_registration_data_;
@@ -177,8 +181,10 @@ class DefaultBrowserBeaconTest
}
// Override the registry so that tests can freely push state to it.
- 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));
// Ensure that IsPerUserInstall returns the proper value.
ASSERT_EQ(!system_install_, InstallUtil::IsPerUserInstall(chrome_exe_));

Powered by Google App Engine
This is Rietveld 408576698