2 files changed, 62 insertions, 0 deletions

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
index e76461f3..42301f30 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
@@ -143,6 +143,32 @@ namespace WixToolsetTest.BurnE2E
         }
 
         [RuntimeFact]
+        public void CanUseLargeCustomExitCode()
+        {
+            var customExitCodeExePackageBundle = this.CreateBundleInstaller(@"CustomExitCodeExePackage");
+
+            var installLogPath = customExitCodeExePackageBundle.Install(5, "EXEEXITCODE=-2147024891");
+            customExitCodeExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "TestExe.exe\" /ec -2147024891"));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "The process for package: TestExe exited with code: 0x80070005. The exit code has been translated to type: ErrorScheduleReboot and restart: Required."));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "Applied execute package: TestExe, result: 0x80070005, restart: Required"));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "Apply complete, result: 0x80070005, restart: Required, ba requested restart:  No"));
+        }
+
+        [RuntimeFact]
+        public void CanUseWildcardCustomExitCode()
+        {
+            var customExitCodeExePackageBundle = this.CreateBundleInstaller(@"CustomExitCodeExePackage");
+
+            var installLogPath = customExitCodeExePackageBundle.Install((int)MSIExec.MSIExecReturnCode.SUCCESS, "EXEEXITCODE=1");
+            customExitCodeExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "TestExe.exe\" /ec 1"));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, "The process for package: TestExe exited with code: 0x1. The exit code has been translated to type: Success and restart: None."));
+        }
+
+        [RuntimeFact]
         public void CanInstallAndUninstallPerUserArpEntryExePackage()
         {
             var perUserArpEntryExePackageBundle = this.CreateBundleInstaller(@"PerUserArpEntryExePackage");
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs
index df666833..f7ec8647 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/UpdateBundleTests.cs
@@ -242,5 +242,41 @@ namespace WixToolsetTest.BurnE2E
             packageBv1.VerifyInstalled(false);
             packageBv2.VerifyInstalled(false);
         }
+
+        // Installs bundle Bv1.0 then attempts an update to bundle Bv2.0 during modify (server exists, v2.0 feed with wrong hash).
+        [RuntimeFact]
+        public void CanBlockWrongUpdateBundleFromDownloadInsteadOfModify()
+        {
+            var packageBv1 = this.CreatePackageInstaller("PackageBv1");
+            var packageBv2 = this.CreatePackageInstaller("PackageBv2");
+            var bundleBv1 = this.CreateBundleInstaller("BundleBv1");
+            var bundleBv2 = this.CreateBundleInstaller("BundleBv2");
+            var webServer = this.CreateWebServer();
+
+            webServer.AddFiles(new Dictionary<string, string>
+            {
+                { "/BundleB/feed", Path.Combine(this.TestContext.TestDataFolder, "FeedBv2.0_wronghash.xml") },
+                { "/BundleB/2.0/BundleB.exe", bundleBv2.Bundle },
+            });
+            webServer.Start();
+
+            packageBv1.VerifyInstalled(false);
+            packageBv2.VerifyInstalled(false);
+
+            bundleBv1.Install();
+            bundleBv1.VerifyRegisteredAndInPackageCache();
+
+            packageBv1.VerifyInstalled(true);
+            packageBv2.VerifyInstalled(false);
+
+            // Run the v1 bundle requesting an update bundle.
+            bundleBv1.Modify(unchecked((int)0x80091007), arguments: "-checkupdate");
+
+            bundleBv1.VerifyRegisteredAndInPackageCache();
+            bundleBv2.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            packageBv1.VerifyInstalled(true);
+            packageBv2.VerifyInstalled(false);
+        }
     }
 }