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

Unified Diff: rlz/test/rlz_test_helpers.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
« no previous file with comments | « components/user_prefs/tracked/registry_hash_store_contents_win_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: rlz/test/rlz_test_helpers.cc
diff --git a/rlz/test/rlz_test_helpers.cc b/rlz/test/rlz_test_helpers.cc
index 4e870fd41f335a25ed28e57dd760824828d58548..2d4b6dd55e045e750c5d1f8f72acf4ea15ab9f6b 100644
--- a/rlz/test/rlz_test_helpers.cc
+++ b/rlz/test/rlz_test_helpers.cc
@@ -115,8 +115,10 @@ void InitializeRegistryOverridesForTesting(
KEY_READ), &data);
}
- override_manager->OverrideRegistry(HKEY_LOCAL_MACHINE);
- override_manager->OverrideRegistry(HKEY_CURRENT_USER);
+ ASSERT_NO_FATAL_FAILURE(
+ override_manager->OverrideRegistry(HKEY_LOCAL_MACHINE));
+ ASSERT_NO_FATAL_FAILURE(
+ override_manager->OverrideRegistry(HKEY_CURRENT_USER));
if (do_copy) {
base::win::RegKey key(
@@ -131,7 +133,8 @@ void InitializeRegistryOverridesForTesting(
void RlzLibTestNoMachineStateHelper::SetUp() {
#if defined(OS_WIN)
- InitializeRegistryOverridesForTesting(&override_manager_);
+ ASSERT_NO_FATAL_FAILURE(
+ InitializeRegistryOverridesForTesting(&override_manager_));
#elif defined(OS_MACOSX)
base::mac::ScopedNSAutoreleasePool pool;
#endif // defined(OS_WIN)
« no previous file with comments | « components/user_prefs/tracked/registry_hash_store_contents_win_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698