diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 09:57:53 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 09:57:53 +0000 |
| commit | 96bddd78d04506102636de48442a8b7b23e1f050 (patch) | |
| tree | cbcdeb9bc86b1437a0e99cccf9b887292dd849a7 | |
| parent | 36d09341524ced548512d5d567ac3bbbcc6efdec (diff) | |
| download | chromium_src-96bddd78d04506102636de48442a8b7b23e1f050.zip chromium_src-96bddd78d04506102636de48442a8b7b23e1f050.tar.gz chromium_src-96bddd78d04506102636de48442a8b7b23e1f050.tar.bz2 | |
Disable policy indicator CertificateManager test in Debug builds
BUG=337102
NOTRY=true
NOTREECHECKS=true
TBR=eustas@chromium.org, dconnelly@chromium.org
Review URL: https://codereview.chromium.org/139853009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246559 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/options/certificate_manager_browsertest.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc index 4937fbe..68e897b 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc @@ -119,8 +119,17 @@ class CertificateManagerBrowserTest : public options::OptionsUIBrowserTest { #if defined(OS_CHROMEOS) // Ensure policy-installed certificates without web trust do not display // the managed setting indicator (only on Chrome OS). + +// Triggers a Blink ASSERT in Debug configurations: http://crbug.com/337102 +#if !defined(NDEBUG) +#define MAYBE_PolicyCertificateWithoutWebTrustHasNoIndicator \ + DISABLED_PolicyCertificateWithoutWebTrustHasNoIndicator +#else +#define MAYBE_PolicyCertificateWithoutWebTrustHasNoIndicator \ + PolicyCertificateWithoutWebTrustHasNoIndicator +#endif IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest, - PolicyCertificateWithoutWebTrustHasNoIndicator) { + MAYBE_PolicyCertificateWithoutWebTrustHasNoIndicator) { LoadONCPolicy("certificate-authority.onc"); NavigateToSettings(); ClickElement("#certificatesManageButton"); @@ -129,11 +138,21 @@ IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest, } #endif +// Triggers a Blink ASSERT in Debug configurations: http://crbug.com/337102 #if defined(OS_CHROMEOS) // Ensure policy-installed certificates with web trust display the // managed setting indicator (only on Chrome OS). + +// Triggers a Blink ASSERT in Debug configurations: http://crbug.com/337102 +#if !defined(NDEBUG) +#define MAYBE_PolicyCertificateWithWebTrustHasIndicator \ + DISABLED_PolicyCertificateWithWebTrustHasIndicator +#else +#define MAYBE_PolicyCertificateWithWebTrustHasIndicator \ + PolicyCertificateWithWebTrustHasIndicator +#endif IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest, - PolicyCertificateWithWebTrustHasIndicator) { + MAYBE_PolicyCertificateWithWebTrustHasIndicator) { LoadONCPolicy("certificate-web-authority.onc"); NavigateToSettings(); ClickElement("#certificatesManageButton"); |