Improve event waits in DebugAdapterTests

This change also adds a slight logging tweak to PowerShellContext to make
the execution result more clear when the invocation state changes.

Author: daviwil

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
+using Microsoft.PowerShell.EditorServices.Console;
 using Microsoft.PowerShell.EditorServices.Utility;
 using Nito.AsyncEx;
 using System;
@@ -17,9 +18,7 @@
 
 namespace Microsoft.PowerShell.EditorServices
 {
-    using Microsoft.PowerShell.EditorServices.Console;
     using System.Management.Automation;
-    using System.Management.Automation.Host;
     using System.Management.Automation.Runspaces;
 
     /// <summary>
@@ -567,9 +566,10 @@ private void OnSessionStateChanged(object sender, SessionStateChangedEventArgs e
             Logger.Write(
                 LogLevel.Verbose,
                 string.Format(
-                    "Session state changed --\r\n\r\n    Old state: {0}\r\n    New state: {1}",
+                    "Session state changed --\r\n\r\n    Old state: {0}\r\n    New state: {1}\r\n    Result: {2}",
                     this.SessionState.ToString(),
-                    e.NewSessionState.ToString()));
+                    e.NewSessionState.ToString(),
+                    e.ExecutionResult));
 
             this.SessionState = e.NewSessionState;
 

test/PowerShellEditorServices.Test.Host/DebugAdapterTests.cs

@@ -76,8 +76,10 @@ await this.SendRequest(
 
             // Abort script execution
             Task terminatedEvent = this.WaitForEvent(TerminatedEvent.Type);
-            await this.SendRequest(DisconnectRequest.Type, new object());
-            await terminatedEvent;
+            await 
+                Task.WhenAll(
+                    this.SendRequest(DisconnectRequest.Type, new object()),
+                    terminatedEvent);
         }
 
         [Fact]
@@ -93,8 +95,10 @@ public async Task DebugAdapterReceivesOutputEvents()
 
             // Abort script execution
             Task terminatedEvent = this.WaitForEvent(TerminatedEvent.Type);
-            await this.SendRequest(DisconnectRequest.Type, new object());
-            await terminatedEvent;
+            await
+                Task.WhenAll(
+                    this.SendRequest(DisconnectRequest.Type, new object()),
+                    terminatedEvent);
         }
 
         private Task LaunchScript(string scriptPath)