TEMP: Testing again...

Author: daviwil

test/PowerShellEditorServices.Test.Host/LanguageServerTests.cs

@@ -538,9 +538,6 @@ await requestContext.SendResult(
  ResponseText = "John"
  });
 
- // Wait for execution to complete
- await evaluateTask;
-
  // Skip the initial script lines (4 script lines plus 2 blank lines)
  string[] scriptLines = await outputReader.ReadLines(6);
 
@@ -563,6 +560,9 @@ await requestContext.SendResult(
  Assert.Equal("Key Value", outputLines[1]);
  Assert.Equal("--- -----", outputLines[2]);
  Assert.Equal("Name John ", outputLines[3]);
+
+ // Wait for execution to complete
+ await evaluateTask;
  }
 
  private async Task SendOpenFileEvent(string filePath, bool waitForDiagnostics = true)

test/PowerShellEditorServices.Test.Host/OutputReader.cs

@@ -32,71 +32,80 @@ public OutputReader(ProtocolEndpoint protocolClient)
 
  public async Task<string> ReadLine(string expectedOutputCategory = "stdout")
  {
- bool lineHasNewLine = false;
- string[] outputLines = null;
- string nextOutputString = string.Empty;
+ try
+ {
+ bool lineHasNewLine = false;
+ string[] outputLines = null;
+ string nextOutputString = string.Empty;
 
- // Wait no longer than 5 seconds for output to come back
- CancellationTokenSource cancellationSource = new CancellationTokenSource(5000);
+  // Wait no longer than 7 seconds for output to come back
+  CancellationTokenSource cancellationSource = new CancellationTokenSource(7000);
 
- if (this.bufferedOutput.Count > 0)
- {
- Assert.Equal(expectedOutputCategory, this.currentOutputCategory);
+ // Any lines in the buffer?
+ if (this.bufferedOutput.Count > 0)
+ {
+ Assert.Equal(expectedOutputCategory, this.currentOutputCategory);
 
- // Return the first buffered line
- var lineTuple = this.bufferedOutput.Dequeue();
- nextOutputString = lineTuple.Item1;
- lineHasNewLine = lineTuple.Item2;
- }
+  // Return the first buffered line
+  var lineTuple = this.bufferedOutput.Dequeue();
+  nextOutputString = lineTuple.Item1;
+  lineHasNewLine = lineTuple.Item2;
+  }
 
- // Loop until we get a full line of output
- while (!lineHasNewLine)
- {
- // Execution reaches this point if a buffered line wasn't available
- OutputEventBody nextOutputEvent = 
- await this.outputQueue.DequeueAsync(
- cancellationSource.Token);
-
- // Verify that the output is of the expected type
- Assert.Equal(expectedOutputCategory, nextOutputEvent.Category);
- this.currentOutputCategory = nextOutputEvent.Category;
-
- // Split up the output into multiple lines
- outputLines = 
- nextOutputEvent.Output.Split(
- new string[] { "\n", "\r\n" },
- StringSplitOptions.None);
-
- // Add the first bit of output to the existing string
- nextOutputString += outputLines[0];
-
- // Have we found a newline now?
- lineHasNewLine =
- outputLines.Length > 1 ||
- nextOutputEvent.Output.EndsWith("\n");
-
- // Buffer any remaining lines for future reads
- if (outputLines.Length > 1)
+ // Loop until we get a full line of output
+ while (!lineHasNewLine)
  {
- for (int i = 1; i < outputLines.Length; i++)
+ // Execution reaches this point if a buffered line wasn't available
+ Task<OutputEventBody> outputTask =
+ this.outputQueue.DequeueAsync(
+ cancellationSource.Token);
+ OutputEventBody nextOutputEvent = await outputTask;
+
+ // Verify that the output is of the expected type
+ Assert.Equal(expectedOutputCategory, nextOutputEvent.Category);
+ this.currentOutputCategory = nextOutputEvent.Category;
+
+ // Split up the output into multiple lines
+ outputLines = 
+ nextOutputEvent.Output.Split(
+ new string[] { "\n", "\r\n" },
+ StringSplitOptions.None);
+
+ // Add the first bit of output to the existing string
+ nextOutputString += outputLines[0];
+
+ // Have we found a newline now?
+ lineHasNewLine =
+ outputLines.Length > 1 ||
+ nextOutputEvent.Output.EndsWith("\n");
+
+ // Buffer any remaining lines for future reads
+ if (outputLines.Length > 1)
  {
- this.bufferedOutput.Enqueue(
- new Tuple<string, bool>(
- outputLines[i],
-
- // The line has a newline if it's not the last segment or
- // if the current output string ends with a newline
- i < outputLines.Length - 1 ||
- nextOutputEvent.Output.EndsWith("\n")));
+ for (int i = 1; i < outputLines.Length; i++)
+ {
+ this.bufferedOutput.Enqueue(
+ new Tuple<string, bool>(
+ outputLines[i],
+
+ // The line has a newline if it's not the last segment or
+ // if the current output string ends with a newline
+ i < outputLines.Length - 1 ||
+ nextOutputEvent.Output.EndsWith("\n")));
+ }
  }
+
+ // At this point, the state of lineHasNewLine will determine
+ // whether the loop continues to wait for another output
+ // event that completes the current line.
  }
 
- // At this point, the state of lineHasNewLine will determine
- // whether the loop continues to wait for another output
- // event that completes the current line.
+ return nextOutputString;
+ }
+ catch (TaskCanceledException)
+ {
+ throw new TimeoutException("Timed out waiting for an input line.");
  }
-
- return nextOutputString;
  }
 
  public async Task<string[]> ReadLines(int lineCount, string expectedOutputCategory = "stdout")