try again

ryfu-msft · Dec 10, 2024 · bc8221f · bc8221f
1 parent b5f3c16
commit bc8221f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/AppInstallerCLIE2ETests/Constants.cs b/src/AppInstallerCLIE2ETests/Constants.cs
@@ -122,7 +122,7 @@ public class Constants
         public const string PathSubKey_User = @"Environment";
         public const string PathSubKey_Machine = @"SYSTEM\CurrentControlSet\Control\Session Manager\Environment";
         public const string FontsSubKey = @"Software\Microsoft\Windows NT\CurrentVersion\Fonts";
-        public const string TestFontSubKeyName = "Cascadia Code PL (True Type)";
+        public const string TestFontSubKeyName = "Cascadia Code PL Regular (TrueType)";
 
         // User settings
         public const string ArchiveExtractionMethod = "archiveExtractionMethod";

diff --git a/src/AppInstallerCLIE2ETests/Helpers/TestCommon.cs b/src/AppInstallerCLIE2ETests/Helpers/TestCommon.cs
@@ -389,12 +389,17 @@ public static void VerifyFontPackage(
             if (shouldExist)
             {
                 // TODO: Replace with font uninstall when implemented.
-                File.Delete(expectedFontInstallPath);
+                if (fontEntryExists)
+                {
+                    using (RegistryKey fontsRegistryKey = baseKey.OpenSubKey(Constants.FontsSubKey, true))
+                    {
+                        fontsRegistryKey.DeleteSubKey(fontSubKeyName);
+                    }
+                }
 
-                using (RegistryKey fontsRegistryKey = baseKey.OpenSubKey(Constants.FontsSubKey, true))
+                if (fontFileExists)
                 {
-                    fontsRegistryKey.DeleteSubKey(fontSubKeyName);
-                    RegistryKey fontEntry = fontsRegistryKey.OpenSubKey(fontSubKeyName, true);
+                    File.Delete(expectedFontInstallPath);
                 }
             }