aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/WixToolsetTest.BurnE2E
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-02-08 13:29:34 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-02-09 17:09:11 -0600
commit652719fc9d4a6afc9fb016d2d379a04c0bf40e04 (patch)
tree7c0ae8fb3f5b7bef67637541b82912762ce8e44d /src/test/burn/WixToolsetTest.BurnE2E
parent94fa4ee7077d10d20b0ea2cfeda77ce776663aac (diff)
downloadwix-652719fc9d4a6afc9fb016d2d379a04c0bf40e04.tar.gz
wix-652719fc9d4a6afc9fb016d2d379a04c0bf40e04.tar.bz2
wix-652719fc9d4a6afc9fb016d2d379a04c0bf40e04.zip
Add runtime testing for #6705.
Diffstat (limited to 'src/test/burn/WixToolsetTest.BurnE2E')
-rw-r--r--src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs1
-rw-r--r--src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index 7e3e28c1..69a1fa68 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -1077,6 +1077,7 @@ namespace WixToolsetTest.BurnE2E
1077 1077
1078 Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine")); 1078 Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine"));
1079 Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, cached: Yes")); 1079 Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, cached: Yes"));
1080 Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related package: \{[0-9A-Za-z\-]{36}\}, scope: PerUser, version: 1.0.0.0, language: 0 operation: MajorUpgrade"));
1080 1081
1081 bundleHv2.Uninstall(); 1082 bundleHv2.Uninstall();
1082 bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache(); 1083 bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache();
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
index 6d81252e..9eb5081e 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
@@ -44,10 +44,12 @@ namespace WixToolsetTest.BurnE2E
44 bundleAv1.Install(); 44 bundleAv1.Install();
45 bundleAv1.VerifyRegisteredAndInPackageCache(); 45 bundleAv1.VerifyRegisteredAndInPackageCache();
46 46
47 bundleAv2x64.Install(); 47 var bundleAv2x64InstallLogFilePath = bundleAv2x64.Install();
48 bundleAv2x64.VerifyRegisteredAndInPackageCache(); 48 bundleAv2x64.VerifyRegisteredAndInPackageCache();
49 49
50 bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache(); 50 bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
51
52 Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2x64InstallLogFilePath, @"Detected related package: \{[0-9A-Za-z\-]{36}\}, scope: PerMachine, version: 1.0.0.0, language: 1033 operation: MajorUpgrade"));
51 } 53 }
52 54
53 [Fact] 55 [Fact]