starred/terminal-microsoft-1
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-07-08 17:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize commandline in media resource tests (#20118)

Browse Source 
## Summary of the Pull Request
Some of the Media Resource tests were failing on my machine. Turns out
that it's because my machine uses `C:\WINDOWS` instead of `C:\Windows`.

This PR fixes those tests by calling `Profile::NormalizeCommandline()`
on a few impacted strings. This also makes them loaded after enabling
filesystem redirection in `TEST_CLASS_SETUP` so that we resolve to the
correct path expected by x86.

Admittedly, I'm not the biggest fan of using that to fix the tests, but
it's better than the alternative which is a case-insensitive string
comparison. Also, the tests are testing fallback behavior, so this
doesn't really impact that. It just makes the tests more consistently
reliable.

This also removes the unused `pingCommandline` variable.

## Validation Steps Performed
✅ Tests pass
This commit is contained in:
Carlos Zamora
2026-04-15 12:13:41 -07:00
committed by GitHub
parent 33a80191c1
commit 8f4fdf9751
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cascadia/UnitTests_SettingsModel/MediaResourceTests.cpp
View File

@@ -105,9 +105,10 @@ namespace SettingsModelUnitTests
TEST_METHOD(RealResolverUrlCases);
TEST_METHOD(RealResolverUNCCases);
static constexpr std::wstring_view pingCommandline{ LR"(C:\Windows\System32\PING.EXE)" }; // Normalized by Profile (this is the casing that Windows stores on disk)
static constexpr std::wstring_view overrideCommandline{ LR"(C:\Windows\System32\cscript.exe)" };
static constexpr std::wstring_view cmdCommandline{ LR"(C:\Windows\System32\cmd.exe)" }; // The default commandline for a profile
// These are normalized by NormalizeCommandLine, which resolves to the on-disk casing.
// They are used in test cases where media paths fall back to profile command lines.
static inline std::wstring overrideCommandline;
static inline std::wstring cmdCommandline;
static constexpr std::wstring_view fragmentBasePath1{ LR"(C:\Windows\Media)" };
private:
@@ -218,6 +219,9 @@ namespace SettingsModelUnitTests
// Some of our tests use paths under system32. Just don't redirect them.
Wow64DisableWow64FsRedirection(&redirectionFlag);
#endif
// Normalize these AFTER the call above so that we get the correctly redirected paths.
overrideCommandline = implementation::Profile::NormalizeCommandLine(LR"(C:\Windows\System32\cscript.exe)");
cmdCommandline = implementation::Profile::NormalizeCommandLine(LR"(C:\Windows\System32\cmd.exe)");
return true;
}