try rename

ryfu-msft · Nov 14, 2023 · 0b6da99 · 0b6da99
1 parent 01ccda4
commit 0b6da99
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/AppInstallerCLIE2ETests/Helpers/WinGetSettingsHelper.cs b/src/AppInstallerCLIE2ETests/Helpers/WinGetSettingsHelper.cs
@@ -44,6 +44,7 @@ public static void InitializeWingetSettings()
                         { "directMSI", false },
                         { "windowsFeature", false },
                         { "resume", false },
+                        { "reboot", false },
                     }
                 },
                 {
@@ -210,6 +211,7 @@ public static void InitializeAllFeatures(bool status)
             ConfigureFeature("directMSI", status);
             ConfigureFeature("windowsFeature", status);
             ConfigureFeature("resume", status);
+            ConfigureFeature("reboot", status);
         }
 
         private static JObject GetJsonSettingsObject(string objectName)

diff --git a/src/AppInstallerCLIE2ETests/ResumeCommand.cs b/src/AppInstallerCLIE2ETests/ResumeCommand.cs
@@ -76,9 +76,11 @@ public void InstallRequiresRebootToFinish()
             var checkpointsDir = TestCommon.GetCheckpointsDirectory();
             int initialCheckpointsCount = Directory.Exists(checkpointsDir) ? Directory.GetDirectories(checkpointsDir).Length : 0;
 
-            var result = TestCommon.RunAICLICommand("install", $"--id AppInstallerTest.RebootRequired --custom '/ExitCode 9'");
+            var installDir = TestCommon.GetRandomTestDir();
+            var result = TestCommon.RunAICLICommand("install", $"TestRebootRequired --custom '/ExitCode 9' -l {installDir}");
             Assert.AreNotEqual(Constants.ErrorCode.ERROR_INSTALL_REBOOT_REQUIRED_TO_FINISH, result.ExitCode);
             Assert.True(result.StdOut.Contains("Restart your PC to finish installation."));
+            Assert.True(TestCommon.VerifyTestExeInstalledAndCleanup(installDir));
 
             int actualCheckpointsCount = Directory.GetDirectories(checkpointsDir).Length;
 
@@ -96,9 +98,11 @@ public void InstallRequiresRebootToInstall()
 
             int initialCheckpointsCount = Directory.Exists(checkpointsDir) ? Directory.GetDirectories(checkpointsDir).Length : 0;
 
-            var result = TestCommon.RunAICLICommand("install", $"--id AppInstallerTest.RebootRequired --custom '/ExitCode 10'");
+            var installDir = TestCommon.GetRandomTestDir();
+            var result = TestCommon.RunAICLICommand("install", $"TestRebootRequired --custom '/ExitCode 10' -l {installDir}");
             Assert.AreNotEqual(Constants.ErrorCode.ERROR_INSTALL_REBOOT_REQUIRED_FOR_INSTALL, result.ExitCode);
             Assert.True(result.StdOut.Contains("Installation failed. Restart your PC then try again."));
+            Assert.True(TestCommon.VerifyTestExeInstalledAndCleanup(installDir));
 
             int actualCheckpointsCount = Directory.GetDirectories(checkpointsDir).Length;
             Assert.AreEqual(initialCheckpointsCount + 1, actualCheckpointsCount);

diff --git a/...ests/TestExeInstaller_RebootRequired.yaml → ...ests/TestExeInstaller.RebootRequired.yaml b/...ests/TestExeInstaller_RebootRequired.yaml → ...ests/TestExeInstaller.RebootRequired.yaml