From 0b8f7ca9eb4156d8a4d1321c978aa362c03e2c96 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 10 Dec 2021 14:28:11 -0600
Subject: Clean up some E2E tests.

---
 src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs           | 6 ------
 src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs | 1 -
 src/test/burn/TestData/TestData.proj                             | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/test/burn/TestData')

diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs
index ea46c5b2..a9dac352 100644
--- a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs
@@ -7,20 +7,14 @@
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
     </PackageGroup>
 
-    <!-- Reenable when fixed
     <Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}">
-    -->
-    <Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/packages.cab">
       <PackageGroupRef Id="BundlePackages" />
     </Container>
   </Fragment>
 
   <Fragment>
     <PayloadGroup Id="LayoutOnlyPayloads">
-      <Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/LayoutOnlyPayload" />
-      <!-- Reenable when fixed
       <Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{1}" />
-      -->
     </PayloadGroup>
   </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
index 795dc13a..382c56c2 100644
--- a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
@@ -4,7 +4,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
     <PackageGroup Id="BundlePackages">
-      <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 -->
       <RollbackBoundary Id="nonvital" Vital="no" />
       <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" Permanent="yes" />
diff --git a/src/test/burn/TestData/TestData.proj b/src/test/burn/TestData/TestData.proj
index 3f56d5b7..27bfb02b 100644
--- a/src/test/burn/TestData/TestData.proj
+++ b/src/test/burn/TestData/TestData.proj
@@ -5,7 +5,7 @@
   <ItemGroup>
     <TestDataProject Include="**\*.wixproj" />
     
-    <!-- https://github.com/wixtoolset/issues/issues/6387 -->
+    <!-- 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" />
-- 
cgit v1.2.3-55-g6feb