Fix and reenable some skipped E2E Burn patching tests
Rob Mensching committed
Sep 22, 2022 at 16:53 UTC
19aa5d8fbbeadd90e536110f00e262e1e79c4487
2 files changed
+5
-13
src/test/burn/TestData/TestData.proj
-8
@@ -4,14 +4,6 @@
4
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<ItemGroup>
6
<TestDataProject Include="**\*.wixproj" />
7
-
8
- <!-- https://github.com/wixtoolset/issues/issues/6401 -->
9
- <TestDataProject Remove="DependencyTests\BundleC\BundleC.wixproj" />
10
- <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_1\BundleF_PatchAv1_0_1.wixproj" />
11
- <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_2\BundleF_PatchAv1_0_2.wixproj" />
12
- <TestDataProject Remove="DependencyTests\BundleJ_Patch\BundleJ_Patch.wixproj" />
13
- <TestDataProject Remove="DependencyTests\PatchA\PatchA.wixproj" />
14
- <TestDataProject Remove="DependencyTests\PatchB\PatchB.wixproj" />
7
</ItemGroup>
8
9
<Target Name="Build">
src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+5
-5
@@ -40,7 +40,7 @@ namespace WixToolsetTest.BurnE2E
40
packageFv1.VerifyInstalled(false);
41
}
42
43
- [RuntimeFact (Skip = "https://github.com/wixtoolset/issues/issues/6401")]
43
+ [RuntimeFact]
44
public void CanKeepSameExactPackageAfterUpgradingBundleWithSlipstreamedPatch()
45
{
46
var originalVersion = "1.0.0.0";
@@ -181,7 +181,7 @@ namespace WixToolsetTest.BurnE2E
181
bundleAv1.VerifyExeTestRegistryRootDeleted(testRegistryValueExe);
182
}
183
184
- [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
184
+ [RuntimeFact]
185
public void CanMinorUpgradeDependencyPackageFromPatchBundle()
186
{
187
var originalVersion = "1.0.0.0";
@@ -231,7 +231,7 @@ namespace WixToolsetTest.BurnE2E
231
}
232
}
233
234
- [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
234
+ [RuntimeFact]
235
public void CanMinorUpgradeDependencyPackageFromPatchBundleThenUninstallToRestoreBase()
236
{
237
var originalVersion = "1.0.0.0";
@@ -480,7 +480,7 @@ namespace WixToolsetTest.BurnE2E
480
packageB.VerifyInstalled(false);
481
}
482
483
- [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
483
+ [RuntimeFact]
484
public void CanUpgradePatchBundleWithAdditionalPatch()
485
{
486
var originalVersion = "1.0.0.0";
@@ -489,7 +489,7 @@ namespace WixToolsetTest.BurnE2E
489
var testRegistryValue = "PackageA";
490
491
var packageA = this.CreatePackageInstaller("PackageAv1");
492
- var packageB = this.CreatePackageInstaller("PackageBv1");
492
+ var packageB = this.CreatePackageInstaller("PackageB");
493
var bundleF = this.CreateBundleInstaller("BundleF");
494
var bundleF_PatchAv101 = this.CreateBundleInstaller("BundleF_PatchAv1_0_1");
495
var bundleF_PatchAv102 = this.CreateBundleInstaller("BundleF_PatchAv1_0_2");