Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable CNAME uncloaking tests on macOS #8883

Merged
merged 1 commit into from
May 21, 2021

Conversation

antonok-edm
Copy link
Collaborator

Resolves brave/brave-browser#15912

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@antonok-edm antonok-edm requested a review from iefremov May 20, 2021 18:08
@antonok-edm antonok-edm self-assigned this May 20, 2021
@@ -581,6 +581,9 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest,
EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL);
}

// These tests fail intermittently on macOS; see
// https://github.com/brave/brave-browser/issues/15912
#if !defined(OS_MAC)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typically this is done like this

#if defined(OS_WIN)
#define MAYBE_Disable3DAPIs DISABLED_Disable3DAPIs
#else
#define MAYBE_Disable3DAPIs Disable3DAPIs
#endif
IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_Disable3DAPIs)

to be able to "force"-run a disabled test

@antonok-edm antonok-edm force-pushed the disable-cname-tests-macos branch from 542ae70 to ce50558 Compare May 20, 2021 18:37
@antonok-edm antonok-edm force-pushed the disable-cname-tests-macos branch from ce50558 to 4136cb2 Compare May 20, 2021 19:11
@antonok-edm antonok-edm merged commit 4e4580d into master May 21, 2021
@antonok-edm antonok-edm deleted the disable-cname-tests-macos branch May 21, 2021 16:04
@antonok-edm antonok-edm added this to the 1.27.x - Nightly milestone May 21, 2021
brave-builds pushed a commit that referenced this pull request May 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flaky AdBlockServiceTest.CnameCloakedRequestsGetBlocked
2 participants