[PR #13603] [MERGED] Two sets of localtest fixes for July 2022 #29648

Open
opened 2026-01-31 09:36:07 +00:00 by claunia · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/13603
Author: @zadjii-msft
Created: 7/26/2022
Status: Merged
Merged: 7/27/2022
Merged by: @undefined

Base: mainHead: dev/migrie/b/localtests-jul-2022


📝 Commits (7)

📊 Changes

2 files changed (+24 additions, -3 deletions)

View changed files

📝 src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp (+10 -3)
📝 src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp (+14 -0)

📄 Description

Cleans up a couple local test failures.

  • Closes #13474: So, I clearly hadn't ran the local tests at the end of the themes PR. We needed a sensible fallback to SOME theme, even if there wasn't one provided in the user json. This is only really hit in the tests (that don't also include defaults.json.
  • Closes #13323: Meh, the ordering of the keys in this test doesn't matter. Ordering is a map implementation detail. This is fine.
  • Ran tests locally

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/13603 **Author:** [@zadjii-msft](https://github.com/zadjii-msft) **Created:** 7/26/2022 **Status:** ✅ Merged **Merged:** 7/27/2022 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `dev/migrie/b/localtests-jul-2022` --- ### 📝 Commits (7) - [`2dacc1b`](https://github.com/microsoft/terminal/commit/2dacc1b1f0c4f45f425c19ad1cdec13da02b315e) this fixes #13474 - [`33c75f1`](https://github.com/microsoft/terminal/commit/33c75f13b569a96130e334a65d4e3efb6d05133e) okay, that should have been in the parent. Whatever - [`802056f`](https://github.com/microsoft/terminal/commit/802056f69352504b8c3a25189db3b759ec730ceb) this fixes #13323 - [`641748a`](https://github.com/microsoft/terminal/commit/641748a4c4e25cb4d69b60a249184fb1f3d5ab1f) one last one - [`a46e2a3`](https://github.com/microsoft/terminal/commit/a46e2a36f72d24e4de6024cbe28a5dcee126eb30) spel - [`1b3ee16`](https://github.com/microsoft/terminal/commit/1b3ee16579b77d90481e7da6e484091349cda80e) Merge remote-tracking branch 'origin/main' into dev/migrie/b/localtests-jul-2022 - [`4e8975d`](https://github.com/microsoft/terminal/commit/4e8975d2f746d968feaef2e3975d9e913731f5bc) This comment is reworded for clarity ### 📊 Changes **2 files changed** (+24 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp` (+10 -3) 📝 `src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp` (+14 -0) </details> ### 📄 Description Cleans up a couple local test failures. * [x] Closes #13474: So, I clearly hadn't ran the local tests at the end of the themes PR. We needed a sensible fallback to SOME theme, even if there wasn't one provided in the user json. This is only really hit in the tests (that don't also include `defaults.json`. * [x] Closes #13323: Meh, the ordering of the keys in this test doesn't matter. Ordering is a map implementation detail. This is fine. * [x] Ran tests locally --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:36:07 +00:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#29648