diff options
Diffstat (limited to 'src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs')
-rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs index a086d430..3622e2e6 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs | |||
@@ -238,13 +238,11 @@ namespace WixToolsetTest.BurnE2E | |||
238 | var bundleA = this.CreateBundleInstaller("BundleA"); | 238 | var bundleA = this.CreateBundleInstaller("BundleA"); |
239 | var testBAController = this.CreateTestBAController(); | 239 | var testBAController = this.CreateTestBAController(); |
240 | 240 | ||
241 | testBAController.SetImmediatelyQuit(); | ||
242 | |||
243 | using (var dfs = new DisposableFileSystem()) | 241 | using (var dfs = new DisposableFileSystem()) |
244 | { | 242 | { |
245 | var baseTempPath = dfs.GetFolder(true); | 243 | var baseTempPath = dfs.GetFolder(true); |
246 | var logPath = bundleA.Install(0, $"-burn.engine.working.directory=\"{baseTempPath}\""); | 244 | var logPath = bundleA.Install(0, $"-burn.engine.working.directory=\"{baseTempPath}\""); |
247 | Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Burn x86 v5.*, Windows v.* \\(Build .*: Service Pack .*\\), path: {baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.cr\\\\BundleA.exe")); | 245 | Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Caching bundle from: '{baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.be\\\\BundleA.exe' to: 'C:\\\\ProgramData\\\\Package Cache\\\\.*\\\\BundleA.exe'")); |
248 | } | 246 | } |
249 | } | 247 | } |
250 | 248 | ||
@@ -258,8 +256,6 @@ namespace WixToolsetTest.BurnE2E | |||
258 | var testBAController = this.CreateTestBAController(); | 256 | var testBAController = this.CreateTestBAController(); |
259 | var policyPath = bundleA.GetFullBurnPolicyRegistryPath(); | 257 | var policyPath = bundleA.GetFullBurnPolicyRegistryPath(); |
260 | 258 | ||
261 | testBAController.SetImmediatelyQuit(); | ||
262 | |||
263 | try | 259 | try |
264 | { | 260 | { |
265 | using (var dfs = new DisposableFileSystem()) | 261 | using (var dfs = new DisposableFileSystem()) |
@@ -280,8 +276,8 @@ namespace WixToolsetTest.BurnE2E | |||
280 | } | 276 | } |
281 | 277 | ||
282 | var logPath = bundleA.Install(); | 278 | var logPath = bundleA.Install(); |
283 | Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Burn x86 v5.*, Windows v.* \\(Build .*: Service Pack .*\\), path: {baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.cr\\\\BundleA.exe")); | 279 | Assert.True(LogVerifier.MessageInLogFileRegex(logPath, $"Caching bundle from: '{baseTempPath.Replace("\\", "\\\\")}\\\\.*\\\\.be\\\\BundleA.exe' to: 'C:\\\\ProgramData\\\\Package Cache\\\\.*\\\\BundleA.exe'")); |
284 | } | 280 | } |
285 | } | 281 | } |
286 | finally | 282 | finally |
287 | { | 283 | { |