Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for discovery not working on Mac machines #2266

Merged
merged 2 commits into from
Dec 11, 2019
Merged

Fix for discovery not working on Mac machines #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2601ef
Fix for discovery not working on Mac machines
vagisha-nidhi Dec 5, 2019
17d5ef5
Adding test assert
vagisha-nidhi Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,11 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
{
var currentProcessPath = this.processHelper.GetCurrentProcessFileName();

if (string.IsNullOrEmpty(testHostPath))
{
testHostPath = this.GetTestHostPath(runtimeConfigDevPath, depsFilePath, sourceDirectory);
}

// This host manager can create process start info for dotnet core targets only.
// If already running with the dotnet executable, use it; otherwise pick up the dotnet available on path.
// Wrap the paths with quotes in case dotnet executable is installed on a path with whitespace.
Expand Down
3 changes: 2 additions & 1 deletion test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExePresentOnWindows()
}

[TestMethod]
public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnix()
public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnixWithTestHostDllPath()
{
this.mockFileHelper.Setup(ph => ph.Exists("testhost.x86.exe")).Returns(true);
this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
Expand All @@ -262,6 +262,7 @@ public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnix()
var startInfo = this.GetDefaultStartInfo();

StringAssert.Contains(startInfo.FileName, "dotnet");
StringAssert.Contains(startInfo.Arguments, "testhost.dll");
}

[TestMethod]
Expand Down