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

Fixes crash in brave://settings/content/all (1.10.x). #5801

Merged
merged 1 commit into from
Jun 10, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Jun 9, 2020

Fixes brave/brave-browser#10160
Uplift from #5777

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

Fixes crash in brave://settings/content/all.
@mkarolin mkarolin added this to the 1.10.x - Release milestone Jun 9, 2020
@mkarolin mkarolin requested a review from a team June 9, 2020 21:56
@mkarolin mkarolin requested a review from bridiver as a code owner June 9, 2020 21:56
@mkarolin mkarolin self-assigned this Jun 9, 2020
@LaurenWags
Copy link
Member

Linux failed due to known issue (brave/brave-browser#10032) - https://ci.brave.com/job/pr-brave-browser-maxk-issue-10160-1.10.x/1/execution/node/351/log/

19:03:31  [  FAILED  ] BraveRewardsBrowserTest.CheckIfReconcileWasResetEmpty, where TypeParam =  and GetParam() =  (30893 ms)
19:03:31  [574/574] BraveRewardsBrowserTest.CheckIfReconcileWasResetEmpty (31197 ms)
19:03:31  1 test failed:
19:03:31      BraveRewardsBrowserTest.CheckIfReconcileWasResetEmpty (../../brave/components/brave_rewards/browser/rewards_service_browsertest.cc:2941)

macOS failed due to known issue (brave/brave-browser#9339) - https://ci.brave.com/job/pr-brave-browser-maxk-issue-10160-1.10.x/1/execution/node/597/log/

19:57:43  [  FAILED  ] BraveRewardsBrowserTest.NotVerifiedWallet, where TypeParam =  and GetParam() =  (6544 ms)
19:57:43  [567/567] BraveRewardsBrowserTest.NotVerifiedWallet (6867 ms)
19:57:43  1 test failed:
19:57:43      BraveRewardsBrowserTest.NotVerifiedWallet (../../brave/components/brave_rewards/browser/rewards_service_browsertest.cc:2431)

Copy link
Member

@LaurenWags LaurenWags 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.10.x approved after deliberating with @brave/uplift-approvers. As per #5801 (comment), the failures on CI are known issues and not blocking uplift.

@LaurenWags LaurenWags merged commit be7f95e into 1.10.x Jun 10, 2020
@LaurenWags LaurenWags deleted the maxk-issue-10160-1.10.x branch June 10, 2020 18:46
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.

2 participants