Fix tests to successfully run in parallel
Rob Mensching committed
Dec 1, 2017 at 00:55 UTC
5ee1645db44908f67eee90da9cd0197c60711eae
1 file changed
+31
-8
src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
+31
-8
@@ -18,12 +18,20 @@ namespace WixToolsetTest.CoreIntegration
18
var folder = TestData.Get(@"TestData\SingleFile");
19
20
using (var fs = new DisposableFileSystem())
21
- using (var pushd = new Pushd(folder))
21
{
22
var intermediateFolder = fs.GetFolder();
23
24
var program = new Program();
26
- var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
25
+ var result = program.Run(new WixToolsetServiceProvider(), new[]
26
+ {
27
+ "build",
28
+ Path.Combine(folder, "Package.wxs"),
29
+ Path.Combine(folder, "PackageComponents.wxs"),
30
+ "-loc", Path.Combine(folder, "Package.en-us.wxl"),
31
+ "-bindpath", Path.Combine(folder, "data"),
32
+ "-intermediateFolder", intermediateFolder,
33
+ "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
34
+ });
35
36
Assert.Equal(0, result);
37
@@ -35,7 +43,7 @@ namespace WixToolsetTest.CoreIntegration
43
Assert.Single(intermediate.Sections);
44
45
var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single();
38
- Assert.Equal(@"data\test.txt", wixFile[WixFileTupleFields.Source].AsPath().Path);
46
+ Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
47
Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
48
}
49
}
@@ -46,12 +54,19 @@ namespace WixToolsetTest.CoreIntegration
54
var folder = TestData.Get(@"TestData\SimpleModule");
55
56
using (var fs = new DisposableFileSystem())
49
- using (var pushd = new Pushd(folder))
57
{
58
var intermediateFolder = fs.GetFolder();
59
60
var program = new Program();
54
- var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Module.wxs", "-loc", "Module.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msm" });
61
+ var result = program.Run(new WixToolsetServiceProvider(), new[]
62
+ {
63
+ "build",
64
+ Path.Combine(folder, "Module.wxs"),
65
+ "-loc", Path.Combine(folder, "Module.en-us.wxl"),
66
+ "-bindpath", Path.Combine(folder, "data"),
67
+ "-intermediateFolder", intermediateFolder,
68
+ "-o", Path.Combine(intermediateFolder, @"bin\test.msm")
69
+ });
70
71
Assert.Equal(0, result);
72
@@ -62,7 +77,7 @@ namespace WixToolsetTest.CoreIntegration
77
Assert.Single(intermediate.Sections);
78
79
var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single();
65
- Assert.Equal(@"data\test.txt", wixFile[WixFileTupleFields.Source].AsPath().Path);
80
+ Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
81
Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
82
}
83
}
@@ -73,12 +88,20 @@ namespace WixToolsetTest.CoreIntegration
88
var folder = TestData.Get(@"TestData\InstanceTransform");
89
90
using (var fs = new DisposableFileSystem())
76
- using (var pushd = new Pushd(folder))
91
{
92
var intermediateFolder = fs.GetFolder();
93
94
var program = new Program();
81
- var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
95
+ var result = program.Run(new WixToolsetServiceProvider(), new[]
96
+ {
97
+ "build",
98
+ Path.Combine(folder, "Package.wxs"),
99
+ Path.Combine(folder, "PackageComponents.wxs"),
100
+ "-loc", Path.Combine(folder, "Package.en-us.wxl"),
101
+ "-bindpath", Path.Combine(folder, "data"),
102
+ "-intermediateFolder", intermediateFolder,
103
+ "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
104
+ });
105
106
Assert.Equal(0, result);
107