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

Embedded map fingerprinting exceptions (uplift to 1.7.x) #5125

Merged
merged 1 commit into from
Apr 1, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Mar 31, 2020

Uplift of #5109
Fixes brave/brave-browser#8902

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds self-assigned this Mar 31, 2020
@brave-builds brave-builds added this to the 1.7.x - Beta milestone Mar 31, 2020
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv March 31, 2020 22:49
@kjozwiak
Copy link
Member

kjozwiak commented Apr 1, 2020

Going to restart macOS as test-browser failed as per https://ci.brave.com/job/brave-browser-build-pr/job/pr5109_map-fingerprinting-exceptions_1.7.x/1/execution/node/557/log/

21:23:56  [  FAILED  ] BraveRewardsBrowserTest.SplitProcessorAutoContribution, where TypeParam =  and GetParam() =  (8638 ms)
21:23:56  [512/512] BraveRewardsBrowserTest.SplitProcessorAutoContribution (8967 ms)
21:23:56  1 test failed:
21:23:56      BraveRewardsBrowserTest.SplitProcessorAutoContribution (../../brave/components/brave_rewards/browser/rewards_service_browsertest.cc:3084)

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Apr 1, 2020
@pes10k
Copy link
Contributor

pes10k commented Apr 1, 2020

Tested as fixed on nightly

@kjozwiak
Copy link
Member

kjozwiak commented Apr 1, 2020

Looks like it failed test-browser on macOS again due to the following:

00:50:04  [  FAILED  ] BraveRewardsBrowserTest.SplitProcessorAutoContribution, where TypeParam =  and GetParam() =  (9065 ms)
00:50:04  [513/513] BraveRewardsBrowserTest.SplitProcessorAutoContribution (9260 ms)
00:50:04  1 test failed:
00:50:04      BraveRewardsBrowserTest.SplitProcessorAutoContribution (../../brave/components/brave_rewards/browser/rewards_service_browsertest.cc:3084)

After talking with @NejcZdovc, this is an intermittent issue that happens when the UI isn't ready or hasn't been updated. This will eventually be resolved via brave/brave-browser#7060.

@kjozwiak
Copy link
Member

kjozwiak commented Apr 1, 2020

Travis is failing TEST_SUITE=test-security due to the minimist npm package being vulnerable. It's a known issue as per brave/brave-browser#8722 and doesn't block the PR from being uplifted.

@kjozwiak
Copy link
Member

kjozwiak commented Apr 1, 2020

Tested as fixed on nightly

Awesome, thanks @pes10k 👍 QA also quickly checked on Nightly as per #5109 (comment).

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.7.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit f3ea9a4 into 1.7.x Apr 1, 2020
@kjozwiak kjozwiak deleted the pr5109_map-fingerprinting-exceptions_1.7.x branch April 1, 2020 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants