Skip to content

Fix test execution timeout #221

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

Merged
merged 1 commit into from
May 17, 2023
Merged

Fix test execution timeout #221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 19 additions & 10 deletions source/TestAdapter/Executor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class Executor : ITestExecutor
private const int _timeoutMiliseconds = 1000;

/// test session timeout (from the runsettings file)
private int _testSessionTimeout = 300000;
private int _testSessionTimeout = 30_0000;

private IFrameworkHandle _frameworkHandle = null;

Expand Down Expand Up @@ -552,27 +552,36 @@ await Task.Run(async delegate
}

StringBuilder output = new StringBuilder();
bool isFinished = false;
ManualResetEvent testExecutionCompleted = new ManualResetEvent(false);

// attach listener for messages
device.DebugEngine.OnMessage += (message, text) =>
{
_logger.LogMessage(text, Settings.LoggingLevel.Verbose);
output.Append(text);
if (text.Contains(Done))
{
isFinished = true;
// signal test execution completed
testExecutionCompleted.Set();
}
};

device.DebugEngine.RebootDevice(RebootOptions.ClrOnly);

while (!isFinished)
DateTime timeoutForExecution = DateTime.UtcNow.AddMilliseconds(_testSessionTimeout);

if (testExecutionCompleted.WaitOne(_testSessionTimeout))
{
Thread.Sleep(1);
}
_logger.LogMessage($"Tests finished.", Settings.LoggingLevel.Verbose);

_logger.LogMessage($"Tests finished.", Settings.LoggingLevel.Verbose);
ParseTestResults(output.ToString(), results);
ParseTestResults(output.ToString(), results);
}
else
{
_logger.LogMessage($"Tests timed out.", Settings.LoggingLevel.Error);
results.First().Outcome = TestOutcome.Failed;
results.First().ErrorMessage = $"Tests timed out in {device.Description}";
}
}
else
{
Expand Down Expand Up @@ -673,8 +682,8 @@ private async Task<List<TestResult>> RunTestOnEmulatorAsync(
.WithArguments(arguments.ToString())
.WithValidation(CommandResultValidation.None);

// setup cancellation token with a timeout of 5 seconds
using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
// setup cancellation token with the timeout from settings
using (var cts = new CancellationTokenSource(_testSessionTimeout))
{
var cliResult = await cmd.ExecuteBufferedAsync(cts.Token);
var exitCode = cliResult.ExitCode;
Expand Down