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.

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

In-process vstest.console #3728

Merged
merged 28 commits into from
Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ internal DesignModeClient(ICommunicationManager communicationManager, IDataSeria
/// </summary>
public static IDesignModeClient Instance { get; private set; }

public ITestRequestManager TestRequestManager { get; private set; }

/// <summary>
/// Initializes DesignMode
/// </summary>
Expand All @@ -102,7 +104,7 @@ public static void Initialize()
/// </param>
public void ConnectToClientAndProcessRequests(int port, ITestRequestManager testRequestManager)
{
_testRequestManager = testRequestManager;
TestRequestManager = testRequestManager;
EqtTrace.Info("Trying to connect to server on port : {0}", port);
_communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));

Expand Down Expand Up @@ -584,7 +586,6 @@ private void StopTestSession(StopTestSessionPayload payload, ITestRequestManager
#region IDisposable Support

private bool _disposedValue; // To detect redundant calls
public ITestRequestManager _testRequestManager;

protected virtual void Dispose(bool disposing)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,9 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
// NOMERGE: Patching the relative path, so I can run in Playground.
if (!File.Exists(testhostProcessPath))
{
testHostProcessName = Path.Combine("vstest.console", "TestHost", originalTestHostProcessName);
testhostProcessPath = Path.Combine(currentWorkingDirectory, testHostProcessName);
testhostProcessPath = Path.Combine(currentWorkingDirectory, "..", originalTestHostProcessName);
//testHostProcessName = Path.Combine("vstest.console", "TestHost", originalTestHostProcessName);
//testhostProcessPath = Path.Combine(currentWorkingDirectory, testHostProcessName);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
/// <summary>
/// Vstest console request sender for sending requests to vstest.console.exe
/// </summary>
internal class VsTestConsoleRequestSender : ITranslationLayerRequestSender
public class VsTestConsoleRequestSender : ITranslationLayerRequestSender
{
/// <summary>
/// The minimum protocol version that has test session support.
Expand Down
Loading