Clean up some E2E tests.
Sean Hall committed
Dec 10, 2021 at 14:28 UTC
0b8f7ca9eb4156d8a4d1321c978aa362c03e2c96
6 files changed
+7
-14
src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs
-6
@@ -7,20 +7,14 @@
7
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
8
</PackageGroup>
9
10
- <!-- Reenable when fixed
10
<Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}">
12
- -->
13
- <Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/packages.cab">
11
<PackageGroupRef Id="BundlePackages" />
12
</Container>
13
</Fragment>
14
15
<Fragment>
16
<PayloadGroup Id="LayoutOnlyPayloads">
20
- <Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/LayoutOnlyPayload" />
21
- <!-- Reenable when fixed
17
<Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{1}" />
23
- -->
18
</PayloadGroup>
19
</Fragment>
20
</Wix>
src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
-1
@@ -4,7 +4,6 @@
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<Fragment>
6
<PackageGroup Id="BundlePackages">
7
- <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Permanent="yes" /> <!-- TODO: this is a workaround for inability to specify RollbackBoundary as first package, remove when this is fixed -->
7
<RollbackBoundary Id="nonvital" Vital="no" />
8
<MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
9
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" Permanent="yes" />
src/test/burn/TestData/TestData.proj
+1
-1
@@ -5,7 +5,7 @@
5
<ItemGroup>
6
<TestDataProject Include="**\*.wixproj" />
7
8
- <!-- https://github.com/wixtoolset/issues/issues/6387 -->
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" />
src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+4
-4
@@ -40,7 +40,7 @@ namespace WixToolsetTest.BurnE2E
40
packageF.VerifyInstalled(false);
41
}
42
43
- [Fact (Skip = "https://github.com/wixtoolset/issues/issues/6387")]
43
+ [Fact (Skip = "https://github.com/wixtoolset/issues/issues/6401")]
44
public void CanKeepSameExactPackageAfterUpgradingBundleWithSlipstreamedPatch()
45
{
46
var originalVersion = "1.0.0.0";
@@ -124,7 +124,7 @@ namespace WixToolsetTest.BurnE2E
124
}
125
126
#if SUPPORT_ADDON_AND_PATCH_RELATED_BUNDLES
127
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6387")]
127
+ [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
128
#else
129
[Fact(Skip = "addon/patch related bundle")]
130
#endif
@@ -169,7 +169,7 @@ namespace WixToolsetTest.BurnE2E
169
}
170
171
#if SUPPORT_ADDON_AND_PATCH_RELATED_BUNDLES
172
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6387")]
172
+ [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
173
#else
174
[Fact(Skip = "addon/patch related bundle")]
175
#endif
@@ -344,7 +344,7 @@ namespace WixToolsetTest.BurnE2E
344
}
345
346
#if SUPPORT_ADDON_AND_PATCH_RELATED_BUNDLES
347
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6387")]
347
+ [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6401")]
348
#else
349
[Fact(Skip = "addon/patch related bundle")]
350
#endif
src/test/burn/WixToolsetTest.BurnE2E/PatchTests.cs
+1
-1
@@ -55,7 +55,7 @@ namespace WixToolsetTest.BurnE2E
55
packageAv1.VerifyTestRegistryRootDeleted();
56
}
57
58
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6380")]
58
+ [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6675")]
59
public void CanPatchSwidTag()
60
{
61
var originalVersion = "1.0.0.0";
src/test/burn/WixToolsetTest.BurnE2E/SlipstreamTests.cs
+1
-1
@@ -266,7 +266,7 @@ namespace WixToolsetTest.BurnE2E
266
packageBv1.VerifyTestRegistryRootDeleted();
267
}
268
269
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6359")]
269
+ [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6402")]
270
public void CanAutomaticallyPredetermineSlipstreamPatchesAtBuildTime()
271
{
272
var testRegistryValueA = "PackageA";