-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Fix interactive UI tests build #25841
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
Open
Ilie-Lesan
wants to merge
5
commits into
brave:master
Choose a base branch
from
Ilie-Lesan:fix-interactive-ui-tests-build
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+40
−0
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1d97c8f
Fix interactive ui tests build
Ilie-Lesan a4e44e7
Add license header
Ilie-Lesan 83a1fc1
Find a better way to fix the dependency
Ilie-Lesan aa20d84
Silence pre-submit warnings
Ilie-Lesan 07980b6
Don't disable chromium tests
Ilie-Lesan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
24 changes: 24 additions & 0 deletions
24
chromium_src/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* Copyright (c) 2024 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #include <stddef.h> | ||
|
|
||
| namespace chrome { | ||
| inline constexpr char kPrivacySandboxManageTopicsURL[] = | ||
| "chrome://settings/adPrivacy/interests/manage"; | ||
| inline constexpr char kPrivacySandboxAdTopicsURL[] = | ||
| "chrome://settings/adPrivacy/interests"; | ||
| } // namespace chrome | ||
|
|
||
| #define StartWithTwoBlockedTopics DISABLED_StartWithTwoBlockedTopics | ||
| #define BlockFirstTopicOnManageTopicsPage \ | ||
| DISABLED_BlockFirstTopicOnManageTopicsPage | ||
| #define UnblockOneTopicOnAdTopicsPage DISABLED_UnblockOneTopicOnAdTopicsPage | ||
| #define ConfirmDefaultIconIsNotUsed DISABLED_ConfirmDefaultIconIsNotUsed | ||
| #include "src/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc" | ||
| #undef StartWithTwoBlockedTopics | ||
| #undef BlockFirstTopicOnManageTopicsPage | ||
| #undef UnblockOneTopicOnAdTopicsPage | ||
| #undef ConfirmDefaultIconIsNotUsed | ||
12 changes: 12 additions & 0 deletions
12
chromium_src/chrome/browser/ui/views/side_search/side_search_browsertest.cc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /* Copyright (c) 2024 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #include "brave/browser/ui/views/side_panel/brave_side_panel.h" | ||
| #include "chrome/browser/ui/views/frame/browser_view.h" | ||
| #include "chrome/browser/ui/views/side_panel/side_panel.h" | ||
|
|
||
| #define SidePanel BraveSidePanel | ||
| #include "src/chrome/browser/ui/views/side_search/side_search_browsertest.cc" | ||
| #undef SidePanel |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /* Copyright (c) 2024 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #include "brave/browser/ui/views/tabs/brave_tab_hover_card_controller.h" | ||
|
|
||
| // Add this comment so that the pre-submit warnings are silenced | ||
| #include "src/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, I don't see how these defines are related to tests build.
we have
*.filterfiles to disable upstream tests, so we shouldn't disable them via defines here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the
kPrivacySandboxManageTopicsURLandkPrivacySandboxAdTopicsURLpages are not available in Brave, and those added by me are just for fixing the build, I wanted to disable these tests. Disabling the tests via a config file is much better. Thanks!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pls remove these defines, let's only fix the build with your PR. I'd like to merge it, but this is not something we should have here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@goodov Done. Thanks!