diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-15 17:09:55 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-15 18:27:22 -0500 |
| commit | 223606fcd02e6d15e065d1e108e17c8848d35f9f (patch) | |
| tree | 577b3187354582fd2c1c8edcbd8e16ac86624b87 /src/ext/Bal | |
| parent | c4090531d4caac4b8cb3356cb971ff2e1c9f8704 (diff) | |
| download | wix-223606fcd02e6d15e065d1e108e17c8848d35f9f.tar.gz wix-223606fcd02e6d15e065d1e108e17c8848d35f9f.tar.bz2 wix-223606fcd02e6d15e065d1e108e17c8848d35f9f.zip | |
Update some skipped tests to be dynamically skipped.
Diffstat (limited to 'src/ext/Bal')
| -rw-r--r-- | src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs index 25856f4d..3aa2bec7 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs | |||
| @@ -4,6 +4,7 @@ namespace WixToolsetTest.ManagedHost | |||
| 4 | { | 4 | { |
| 5 | using System; | 5 | using System; |
| 6 | using WixBuildTools.TestSupport; | 6 | using WixBuildTools.TestSupport; |
| 7 | using WixBuildTools.TestSupport.XunitExtensions; | ||
| 7 | using Xunit; | 8 | using Xunit; |
| 8 | 9 | ||
| 9 | public class DncHostFixture | 10 | public class DncHostFixture |
| @@ -30,7 +31,7 @@ namespace WixToolsetTest.ManagedHost | |||
| 30 | } | 31 | } |
| 31 | } | 32 | } |
| 32 | 33 | ||
| 33 | [Fact(Skip = "Requires .NET Core 3.1 x86 runtime which might be missing")] | 34 | [SkippableFact] |
| 34 | public void CanLoadFDDx86EarliestCoreMBA() | 35 | public void CanLoadFDDx86EarliestCoreMBA() |
| 35 | { | 36 | { |
| 36 | // https://github.com/microsoft/vstest/issues/3586 | 37 | // https://github.com/microsoft/vstest/issues/3586 |
| @@ -43,13 +44,20 @@ namespace WixToolsetTest.ManagedHost | |||
| 43 | var testEngine = new TestEngine(); | 44 | var testEngine = new TestEngine(); |
| 44 | 45 | ||
| 45 | var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true); | 46 | var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true); |
| 47 | var resultOutput = result.Output.ToArray(); | ||
| 48 | |||
| 49 | if (resultOutput.Length > 0 && resultOutput[0] == "error from hostfxr: It was not possible to find any compatible framework version") | ||
| 50 | { | ||
| 51 | WixAssert.Skip(String.Join(Environment.NewLine, resultOutput)); | ||
| 52 | } | ||
| 53 | |||
| 46 | WixAssert.CompareLineByLine(new[] | 54 | WixAssert.CompareLineByLine(new[] |
| 47 | { | 55 | { |
| 48 | "Loading .NET Core FDD bootstrapper application.", | 56 | "Loading .NET Core FDD bootstrapper application.", |
| 49 | "Creating BA thread to run asynchronously.", | 57 | "Creating BA thread to run asynchronously.", |
| 50 | "EarliestCoreBA", | 58 | "EarliestCoreBA", |
| 51 | "Shutdown,ReloadBootstrapper,0", | 59 | "Shutdown,ReloadBootstrapper,0", |
| 52 | }, result.Output.ToArray()); | 60 | }, resultOutput); |
| 53 | } | 61 | } |
| 54 | } | 62 | } |
| 55 | 63 | ||