From 19aa5d8fbbeadd90e536110f00e262e1e79c4487 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 22 Sep 2022 16:53:03 -0700
Subject: Fix and reenable some skipped E2E Burn patching tests

---
 src/test/burn/TestData/TestData.proj                    |  8 --------
 src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | 10 +++++-----
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/test')

diff --git a/src/test/burn/TestData/TestData.proj b/src/test/burn/TestData/TestData.proj
index 0f7cbee9..9e130987 100644
--- a/src/test/burn/TestData/TestData.proj
+++ b/src/test/burn/TestData/TestData.proj
@@ -4,14 +4,6 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <TestDataProject Include="**\*.wixproj" />
-
-    <!-- https://github.com/wixtoolset/issues/issues/6401 -->
-    <TestDataProject Remove="DependencyTests\BundleC\BundleC.wixproj" />
-    <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_1\BundleF_PatchAv1_0_1.wixproj" />
-    <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_2\BundleF_PatchAv1_0_2.wixproj" />
-    <TestDataProject Remove="DependencyTests\BundleJ_Patch\BundleJ_Patch.wixproj" />
-    <TestDataProject Remove="DependencyTests\PatchA\PatchA.wixproj" />
-    <TestDataProject Remove="DependencyTests\PatchB\PatchB.wixproj" />
   </ItemGroup>
 
   <Target Name="Build">
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index 41f39050..e47a49d9 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -40,7 +40,7 @@ namespace WixToolsetTest.BurnE2E
             packageFv1.VerifyInstalled(false);
         }
 
-        [RuntimeFact (Skip = "https://github.com/wixtoolset/issues/issues/6401")]
+        [RuntimeFact]
         public void CanKeepSameExactPackageAfterUpgradingBundleWithSlipstreamedPatch()
         {
             var originalVersion = "1.0.0.0";
@@ -181,7 +181,7 @@ namespace WixToolsetTest.BurnE2E
             bundleAv1.VerifyExeTestRegistryRootDeleted(testRegistryValueExe);
         }
 
-        [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
+        [RuntimeFact]
         public void CanMinorUpgradeDependencyPackageFromPatchBundle()
         {
             var originalVersion = "1.0.0.0";
@@ -231,7 +231,7 @@ namespace WixToolsetTest.BurnE2E
             }
         }
 
-        [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
+        [RuntimeFact]
         public void CanMinorUpgradeDependencyPackageFromPatchBundleThenUninstallToRestoreBase()
         {
             var originalVersion = "1.0.0.0";
@@ -480,7 +480,7 @@ namespace WixToolsetTest.BurnE2E
             packageB.VerifyInstalled(false);
         }
 
-        [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
+        [RuntimeFact]
         public void CanUpgradePatchBundleWithAdditionalPatch()
         {
             var originalVersion = "1.0.0.0";
@@ -489,7 +489,7 @@ namespace WixToolsetTest.BurnE2E
             var testRegistryValue = "PackageA";
 
             var packageA = this.CreatePackageInstaller("PackageAv1");
-            var packageB = this.CreatePackageInstaller("PackageBv1");
+            var packageB = this.CreatePackageInstaller("PackageB");
             var bundleF = this.CreateBundleInstaller("BundleF");
             var bundleF_PatchAv101 = this.CreateBundleInstaller("BundleF_PatchAv1_0_1");
             var bundleF_PatchAv102 = this.CreateBundleInstaller("BundleF_PatchAv1_0_2");
-- 
cgit v1.2.3-55-g6feb