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

Only wait for OnRewardsInitialized if it didn't already fire #8845

Merged
merged 1 commit into from
May 19, 2021

Conversation

emerick
Copy link
Contributor

@emerick emerick commented May 18, 2021

Resolves brave/brave-browser#15944

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:

@emerick emerick requested a review from mariospr May 18, 2021 16:18
@emerick emerick self-assigned this May 18, 2021
Copy link
Contributor

@mariospr mariospr left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@emerick
Copy link
Contributor Author

emerick commented May 18, 2021

CI passed on Windows, iOS, and Android. CI passed with unrelated browser test failures on Linux. Restarting for Mac.

@emerick emerick 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 May 18, 2021
@emerick emerick force-pushed the rewards-fix-ads-upgrade-browser-test-crash branch from baae047 to 937d0c5 Compare May 18, 2021 21:02
@emerick
Copy link
Contributor Author

emerick commented May 19, 2021

Mac CI passed with the following unrelated and expected browser test failures:

22:08:59      AdBlockServiceTest.CnameCloakedRequestsCanBeExcepted (../../brave/browser/brave_shields/ad_block_service_browsertest.cc:669)
22:08:59      AdBlockServiceTest.CnameCloakedRequestsGetBlocked (../../brave/browser/brave_shields/ad_block_service_browsertest.cc:586)

Ready to merge.

@emerick emerick removed CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels May 19, 2021
@emerick emerick merged commit 5fc68f6 into master May 19, 2021
@emerick emerick deleted the rewards-fix-ads-upgrade-browser-test-crash branch May 19, 2021 13:34
@emerick emerick added this to the 1.26.x - Nightly milestone May 19, 2021
brave-builds pushed a commit that referenced this pull request May 19, 2021
brave-builds pushed a commit that referenced this pull request May 19, 2021
emerick pushed a commit that referenced this pull request May 20, 2021
emerick pushed a commit that referenced this pull request May 24, 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.

Ads upgrade browser test crash
3 participants