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

Fix android test overrides #20825

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Fix android test overrides #20825

merged 1 commit into from
Nov 9, 2023

Conversation

bridiver
Copy link
Collaborator

@bridiver bridiver commented Nov 3, 2023

Resolves brave/brave-browser#27837

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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 wiki
    • npm run lint, npm run presubmit wiki, 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:

@bridiver bridiver requested review from a team as code owners November 3, 2023 01:54
@github-actions github-actions bot added CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) needs-security-review labels Nov 3, 2023
@fmarier fmarier removed their assignment Nov 3, 2023
@bridiver bridiver added CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x64 Do not run CI builds for Windows x64 labels Nov 3, 2023
@bridiver bridiver requested a review from a team as a code owner November 3, 2023 16:39
@bridiver bridiver requested a review from a team as a code owner November 3, 2023 17:11
}

#if BUILDFLAG(IS_WIN)
// Enable high-DPI for interactive tests where the user is expected to
// Many tests validate code that requires user32.dll to be loaded. Loading it,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

with the latest changes to chrome_test_launcher I think this file can be eliminated and replaced with upstream

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the changes here are pulled in from upstream

@bridiver bridiver changed the title Psst test Fix android test overrides Nov 3, 2023
@bridiver bridiver requested a review from a team as a code owner November 3, 2023 19:43
@bridiver bridiver added CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-android Do not run CI builds for Android and removed CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x64 Do not run CI builds for Windows x64 CI/skip-android Do not run CI builds for Android labels Nov 3, 2023
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

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

++

#endif // BUILDFLAG(IS_WIN)
}

ChromeTestSuiteRunner runner;
BraveTestLauncherDelegate delegate(&runner);
Copy link
Member

@goodov goodov Nov 8, 2023

Choose a reason for hiding this comment

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

can you #define-override ChromeTestLauncherDelegate with BraveTestLauncherDelegate and just use browser_tests_runner from chrome?

both chromium and brave tests can use BraveTestLauncherDelegate, that should be fine.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

yes as mentioned here https://github.com/brave/brave-core/pull/20825/files#r1382007273 but I was leaving this for a follow-up because I want to get what I have here merged

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@bridiver bridiver enabled auto-merge November 8, 2023 16:03
@bridiver bridiver added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS labels Nov 9, 2023
@bridiver bridiver merged commit 6f68e2a into master Nov 9, 2023
@bridiver bridiver deleted the psst-test branch November 9, 2023 21:03
@github-actions github-actions bot added this to the 1.62.x - Nightly milestone Nov 9, 2023
@github-actions github-actions bot added feature/web3/wallet feature/web3/wallet/core and removed CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) labels Nov 9, 2023
mkarolin added a commit that referenced this pull request May 1, 2024
The cause of failure for these tests was fixed in
#20825.
mkarolin added a commit that referenced this pull request May 3, 2024
The cause of failure for these tests was fixed in
#20825.
mkarolin added a commit that referenced this pull request May 3, 2024
The cause of failure for these tests was fixed in
#20825.
mkarolin added a commit that referenced this pull request May 3, 2024
The cause of failure for these tests was fixed in
#20825.
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 CI/skip-macos-x64 Do not run CI builds for macOS x64 feature/web3/wallet/core feature/web3/wallet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make Android test enviorment can run browser tests with mojom bound to frames.
8 participants