diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-30 15:32:57 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-30 18:40:49 -0600 |
| commit | 8dfadd0c9068965af138949b630ef8496b4f7bbb (patch) | |
| tree | 58bc40d5306d80a39712470aab0d5bf325eb3a45 /src/test/burn/WixToolsetTest.BurnE2E | |
| parent | 84a1b0f8ffe40a26916b1dfb3e1b59b6b0c31ad4 (diff) | |
| download | wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.tar.gz wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.tar.bz2 wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.zip | |
Don't report related operation in OnDetectRelatedBundle.
#5796
Diffstat (limited to 'src/test/burn/WixToolsetTest.BurnE2E')
| -rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | 2 | ||||
| -rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs index e2975fc9..309241d9 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | |||
| @@ -596,7 +596,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 596 | packageDv2.VerifyInstalled(true); | 596 | packageDv2.VerifyInstalled(true); |
| 597 | 597 | ||
| 598 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine")); | 598 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine")); |
| 599 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, operation: MajorUpgrade, cached: Yes")); | 599 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, cached: Yes")); |
| 600 | 600 | ||
| 601 | bundleHv2.Uninstall(); | 601 | bundleHv2.Uninstall(); |
| 602 | bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache(); | 602 | bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache(); |
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs index 70c0c474..35cc64f0 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs | |||
| @@ -30,7 +30,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 30 | bundleAv2.VerifyRegisteredAndInPackageCache(); | 30 | bundleAv2.VerifyRegisteredAndInPackageCache(); |
| 31 | 31 | ||
| 32 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"OnDetectRelatedBundle\(\) - id: \{[0-9A-Za-z\-]{36}\}, missing from cache: True")); | 32 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"OnDetectRelatedBundle\(\) - id: \{[0-9A-Za-z\-]{36}\}, missing from cache: True")); |
| 33 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerMachine, version: 1\.0\.0\.0, operation: MajorUpgrade, cached: No")); | 33 | Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerMachine, version: 1\.0\.0\.0, cached: No")); |
| 34 | } | 34 | } |
| 35 | } | 35 | } |
| 36 | } | 36 | } |