When rolling back a bundle failure, reinstall all upgrade related bundles.

Fixes #3421

2 files changed, 29 insertions, 2 deletions

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index 69a1fa68..ba02d8ee 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -539,7 +539,7 @@ namespace WixToolsetTest.BurnE2E
             }
         }
 
-        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/3421")]
+        [Fact]
         public void DoesntLoseDependenciesOnFailedMajorUpgradeBundleFromMajorUpdateMsiFifo()
         {
             var packageAv1 = this.CreatePackageInstaller("PackageAv1");
@@ -611,7 +611,7 @@ namespace WixToolsetTest.BurnE2E
             packageGv2.VerifyInstalled(false);
         }
 
-        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/3421")]
+        [Fact]
         public void DoesntLoseDependenciesOnFailedMajorUpgradeBundleFromMajorUpdateMsiLifo()
         {
             var packageAv1 = this.CreatePackageInstaller("PackageAv1");
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
index 9eb5081e..32a04e5c 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
@@ -13,6 +13,33 @@ namespace WixToolsetTest.BurnE2E
         public UpgradeRelatedBundleTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         [Fact]
+        public void ReinstallsOlderBundleAfterFailure()
+        {
+            var packageAv2 = this.CreatePackageInstaller("PackageAv2");
+            var packageAv3 = this.CreatePackageInstaller("PackageAv3");
+            var bundleAv2 = this.CreateBundleInstaller("BundleAv2");
+            var bundleAv3 = this.CreateBundleInstaller("BundleAv3");
+
+            packageAv2.VerifyInstalled(false);
+            packageAv3.VerifyInstalled(false);
+
+            bundleAv2.Install();
+            bundleAv2.VerifyRegisteredAndInPackageCache();
+
+            packageAv2.VerifyInstalled(true);
+            packageAv3.VerifyInstalled(false);
+
+            // Verify https://github.com/wixtoolset/issues/issues/3421
+            var bundleAv3InstallLogFilePath = bundleAv3.Install((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE);
+            bundleAv3.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv3InstallLogFilePath, @"Applied execute package: PackageA, result: 0x0, restart: None"));
+
+            packageAv2.VerifyInstalled(true);
+            packageAv3.VerifyInstalled(false);
+        }
+
+        [Fact]
         public void ReportsRelatedBundleMissingFromCache()
         {
             var packageAv1 = this.CreatePackageInstaller("PackageAv1");