diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-09-22 16:53:03 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-09-23 09:50:52 -0700 |
| commit | 19aa5d8fbbeadd90e536110f00e262e1e79c4487 (patch) | |
| tree | 7637dbe485f9b7130cadd2405431219cf69151ef /src/test | |
| parent | 63b588262aa0b7869741aa888905c1eeda7ae2f8 (diff) | |
| download | wix-19aa5d8fbbeadd90e536110f00e262e1e79c4487.tar.gz wix-19aa5d8fbbeadd90e536110f00e262e1e79c4487.tar.bz2 wix-19aa5d8fbbeadd90e536110f00e262e1e79c4487.zip | |
Fix and reenable some skipped E2E Burn patching tests
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/burn/TestData/TestData.proj | 8 | ||||
| -rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | 10 |
2 files changed, 5 insertions, 13 deletions
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 @@ | |||
| 4 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <ItemGroup> | 5 | <ItemGroup> |
| 6 | <TestDataProject Include="**\*.wixproj" /> | 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" /> | ||
| 15 | </ItemGroup> | 7 | </ItemGroup> |
| 16 | 8 | ||
| 17 | <Target Name="Build"> | 9 | <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 | |||
| 40 | packageFv1.VerifyInstalled(false); | 40 | packageFv1.VerifyInstalled(false); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | [RuntimeFact (Skip = "https://github.com/wixtoolset/issues/issues/6401")] | 43 | [RuntimeFact] |
| 44 | public void CanKeepSameExactPackageAfterUpgradingBundleWithSlipstreamedPatch() | 44 | public void CanKeepSameExactPackageAfterUpgradingBundleWithSlipstreamedPatch() |
| 45 | { | 45 | { |
| 46 | var originalVersion = "1.0.0.0"; | 46 | var originalVersion = "1.0.0.0"; |
| @@ -181,7 +181,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 181 | bundleAv1.VerifyExeTestRegistryRootDeleted(testRegistryValueExe); | 181 | bundleAv1.VerifyExeTestRegistryRootDeleted(testRegistryValueExe); |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")] | 184 | [RuntimeFact] |
| 185 | public void CanMinorUpgradeDependencyPackageFromPatchBundle() | 185 | public void CanMinorUpgradeDependencyPackageFromPatchBundle() |
| 186 | { | 186 | { |
| 187 | var originalVersion = "1.0.0.0"; | 187 | var originalVersion = "1.0.0.0"; |
| @@ -231,7 +231,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 231 | } | 231 | } |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")] | 234 | [RuntimeFact] |
| 235 | public void CanMinorUpgradeDependencyPackageFromPatchBundleThenUninstallToRestoreBase() | 235 | public void CanMinorUpgradeDependencyPackageFromPatchBundleThenUninstallToRestoreBase() |
| 236 | { | 236 | { |
| 237 | var originalVersion = "1.0.0.0"; | 237 | var originalVersion = "1.0.0.0"; |
| @@ -480,7 +480,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 480 | packageB.VerifyInstalled(false); | 480 | packageB.VerifyInstalled(false); |
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | [RuntimeFact(Skip = "https://github.com/wixtoolset/issues/issues/6401")] | 483 | [RuntimeFact] |
| 484 | public void CanUpgradePatchBundleWithAdditionalPatch() | 484 | public void CanUpgradePatchBundleWithAdditionalPatch() |
| 485 | { | 485 | { |
| 486 | var originalVersion = "1.0.0.0"; | 486 | var originalVersion = "1.0.0.0"; |
| @@ -489,7 +489,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 489 | var testRegistryValue = "PackageA"; | 489 | var testRegistryValue = "PackageA"; |
| 490 | 490 | ||
| 491 | var packageA = this.CreatePackageInstaller("PackageAv1"); | 491 | var packageA = this.CreatePackageInstaller("PackageAv1"); |
| 492 | var packageB = this.CreatePackageInstaller("PackageBv1"); | 492 | var packageB = this.CreatePackageInstaller("PackageB"); |
| 493 | var bundleF = this.CreateBundleInstaller("BundleF"); | 493 | var bundleF = this.CreateBundleInstaller("BundleF"); |
| 494 | var bundleF_PatchAv101 = this.CreateBundleInstaller("BundleF_PatchAv1_0_1"); | 494 | var bundleF_PatchAv101 = this.CreateBundleInstaller("BundleF_PatchAv1_0_1"); |
| 495 | var bundleF_PatchAv102 = this.CreateBundleInstaller("BundleF_PatchAv1_0_2"); | 495 | var bundleF_PatchAv102 = this.CreateBundleInstaller("BundleF_PatchAv1_0_2"); |