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

Unified Diff: chrome/install_static/user_data_dir_win_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
« no previous file with comments | « chrome/install_static/product_install_details_unittest.cc ('k') | chrome/installer/gcapi/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/install_static/user_data_dir_win_unittest.cc
diff --git a/chrome/install_static/user_data_dir_win_unittest.cc b/chrome/install_static/user_data_dir_win_unittest.cc
index 30afd0287ca91ed234c9f71158ffbc6a1e68d56a..8029203b2c2990ce99cba08700aaaf4452e4694b 100644
--- a/chrome/install_static/user_data_dir_win_unittest.cc
+++ b/chrome/install_static/user_data_dir_win_unittest.cc
@@ -71,7 +71,8 @@ TEST(UserDataDir, RegistrySettingsInHKLMOverrides) {
// precedence over the command line in both implementations.
registry_util::RegistryOverrideManager override_manager;
base::string16 temp;
- override_manager.OverrideRegistry(HKEY_LOCAL_MACHINE, &temp);
+ ASSERT_NO_FATAL_FAILURE(
+ override_manager.OverrideRegistry(HKEY_LOCAL_MACHINE, &temp));
ScopedNTRegistryTestingOverride nt_override(nt::HKLM, temp);
base::win::RegKey key(HKEY_LOCAL_MACHINE, kPolicyRegistryKey, KEY_WRITE);
@@ -92,7 +93,8 @@ TEST(UserDataDir, RegistrySettingsInHKCUOverrides) {
// precedence over the command line in both implementations.
registry_util::RegistryOverrideManager override_manager;
base::string16 temp;
- override_manager.OverrideRegistry(HKEY_CURRENT_USER, &temp);
+ ASSERT_NO_FATAL_FAILURE(
+ override_manager.OverrideRegistry(HKEY_CURRENT_USER, &temp));
ScopedNTRegistryTestingOverride nt_override(nt::HKCU, temp);
base::win::RegKey key(HKEY_CURRENT_USER, kPolicyRegistryKey, KEY_WRITE);
@@ -113,14 +115,16 @@ TEST(UserDataDir, RegistrySettingsInHKLMTakesPrecedenceOverHKCU) {
// precedence.
registry_util::RegistryOverrideManager override_manager;
base::string16 temp;
- override_manager.OverrideRegistry(HKEY_LOCAL_MACHINE, &temp);
+ ASSERT_NO_FATAL_FAILURE(
+ override_manager.OverrideRegistry(HKEY_LOCAL_MACHINE, &temp));
ScopedNTRegistryTestingOverride nt_override(nt::HKLM, temp);
LONG rv;
base::win::RegKey key1(HKEY_LOCAL_MACHINE, kPolicyRegistryKey, KEY_WRITE);
rv = key1.WriteValue(kUserDataDirRegistryKey, L"111");
ASSERT_EQ(rv, ERROR_SUCCESS);
- override_manager.OverrideRegistry(HKEY_CURRENT_USER, &temp);
+ ASSERT_NO_FATAL_FAILURE(
+ override_manager.OverrideRegistry(HKEY_CURRENT_USER, &temp));
ScopedNTRegistryTestingOverride nt_override2(nt::HKCU, temp);
base::win::RegKey key2(HKEY_CURRENT_USER, kPolicyRegistryKey, KEY_WRITE);
rv = key2.WriteValue(kUserDataDirRegistryKey, L"222");
@@ -138,7 +142,8 @@ TEST(UserDataDir, RegistrySettingWithPathExpansionHKCU) {
registry_util::RegistryOverrideManager override_manager;
base::string16 temp;
- override_manager.OverrideRegistry(HKEY_CURRENT_USER, &temp);
+ ASSERT_NO_FATAL_FAILURE(
+ override_manager.OverrideRegistry(HKEY_CURRENT_USER, &temp));
ScopedNTRegistryTestingOverride nt_override(nt::HKCU, temp);
base::win::RegKey key(HKEY_CURRENT_USER, kPolicyRegistryKey, KEY_WRITE);
LONG rv = key.WriteValue(kUserDataDirRegistryKey, L"${windows}");
« no previous file with comments | « chrome/install_static/product_install_details_unittest.cc ('k') | chrome/installer/gcapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698