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

Changes from 1 commit
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
4 changes: 4 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 @@ -259,6 +259,10 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
if (!testHostExeFound)
{
var currentProcessPath = this.processHelper.GetCurrentProcessFileName();
if (testHostPath == string.Empty)
Copy link
Contributor

@singhsarab singhsarab Dec 10, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always use string.IsNullOrEmpty

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How are you planning to test this ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also think about converging the two calls, if not possible I am okay with as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Converted to string.IsNullOrEmpty.
Also added an extra assert in existing test to veryfy testhost.dll path is determined in non windows scenario.

{
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.
Expand Down