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.

Sign up for GitHub

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

Jump to bottom

Two sets of localtest fixes for July 2022 #13603

Merged
7 commits merged into from
Jul 27, 2022
Merged

Two sets of localtest fixes for July 2022 #13603

7 commits merged into from
Jul 27, 2022

Conversation

zadjii-msft
Copy link
Member

Cleans up a couple local test failures.

@ghost ghost added Area-CodeHealth Issues related to code cleanliness, linting, rules, warnings, errors, static analysis, etc. Area-Theming Anything related to the theming of elements of the window Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. Severity-Crash Crashes are real bad news. labels Jul 26, 2022
@github-actions

This comment has been minimized.

Sign in to view
@zadjii-msft zadjii-msft mentioned this pull request Jul 26, 2022
Closed
carlos-zamora
carlos-zamora reviewed Jul 26, 2022
View reviewed changes
src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp
@@ -1156,6 +1156,18 @@ void CascadiaSettings::ExportFile(winrt::hstring path, winrt::hstring content)

void CascadiaSettings::_validateThemeExists()
{
if (_globals->Themes().Size() == 0)
Copy link
Member

Choose a reason for hiding this comment

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

  • If this is only hit in the tests, shouldn't we be adding the "system" theme in the tests?
  • In a (possibly distant) world where we have multiple GlobalAppSettings in the inheritance structure, I could see some of them not having a theme set. Is that going to be a problem here where we add an empty "system" theme?

Copy link
Member

Choose a reason for hiding this comment

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

The empty system theme IS the system theme (that's actually how it works!)

I think it's important to have in the validation, honestly. defaults.json is a crutch, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm rewording the comment here.

I think it's fine to leave this as a validation step. In reality, we'll always have a themes in defaults.json, but oftentimes the tests just don't even bother with a defaults, for simplicity.

The alternative would be to make the themes in defaults.json actually hardcoded instead, but that seemed more fragile. Seemed like it was a good idea to have the themes actually listed there (esp. for the terminalBackground treatment we're giving the tabs in #13554)

@DHowett DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jul 27, 2022
@ghost
Copy link

ghost commented Jul 27, 2022

Hello @DHowett!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 73e7fd1 into main Jul 27, 2022
@ghost ghost deleted the dev/migrie/b/localtests-jul-2022 branch July 27, 2022 19:40
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlos-zamora carlos-zamora carlos-zamora approved these changes

@DHowett DHowett DHowett approved these changes

Assignees
No one assigned
Labels
Area-CodeHealth Issues related to code cleanliness, linting, rules, warnings, errors, static analysis, etc. Area-Theming Anything related to the theming of elements of the window AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. Severity-Crash Crashes are real bad news.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Lots of local unit tests are failing again SerializationTests::Actions started failing recently
3 participants
@zadjii-msft @DHowett @carlos-zamora