Fixed issues with getting correct deploy status with functional tests.

projectkudu · Feb 6, 2012 · 2d1a585 · 2d1a585
1 parent 2a88bf8
commit 2d1a585
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/Kudu.Client/Deployment/RemoteDeploymentManager.cs b/Kudu.Client/Deployment/RemoteDeploymentManager.cs
@@ -115,10 +115,7 @@ public void Stop()
         {
             if (_connection != null)
             {
-                _connection.Received -= OnReceived;
-                _connection.Error -= OnError;
                 _connection.Stop();
-                _connection = null;
             }
         }
 

diff --git a/Kudu.FunctionalTests/Infrastructure/ApplicationManagerExtensions.cs b/Kudu.FunctionalTests/Infrastructure/ApplicationManagerExtensions.cs
@@ -3,14 +3,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Kudu.Client.Deployment;
+using Kudu.Core.Deployment;
 using Xunit;
 
 namespace Kudu.FunctionalTests.Infrastructure
 {
     public static class ApplicationManagerExtensions
     {
-        private static readonly TimeSpan _defaultTimeOut = TimeSpan.FromMinutes(3);
-        private static bool _errorCallbackInitialized;
+        private static readonly TimeSpan _defaultTimeOut = TimeSpan.FromMinutes(5);
+        private static int _errorCallbackInitialized;
 
         public static void GitDeploy(this ApplicationManager appManager, string repositoryName)
         {
@@ -35,22 +36,30 @@ public static void WaitForDeployment(this RemoteDeploymentManager deploymentMana
         {
             var deployEvent = new ManualResetEvent(false);
 
-            if (!_errorCallbackInitialized)
+            Action<DeployResult> handler = null;
+
+            handler = status =>
+            {
+                if (status.Complete)
+                {
+                    if (Interlocked.Exchange(ref handler, null) != null)
+                    {
+                        deploymentManager.Stop();
+                        deploymentManager.StatusChanged -= handler;
+                        deployEvent.Set();
+                    }
+                }
+            };
+
+            if (Interlocked.Exchange(ref _errorCallbackInitialized, 1) == 0)
             {
-                _errorCallbackInitialized = true;
                 TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
             }
 
             try
             {
                 // Create deployment manager and wait for the deployment to finish
-                deploymentManager.StatusChanged += status =>
-                {
-                    if (status.Complete)
-                    {
-                        deployEvent.Set();
-                    }
-                };
+                deploymentManager.StatusChanged += handler;
 
                 // Start listenting for events
                 deploymentManager.Start();
@@ -67,8 +76,12 @@ public static void WaitForDeployment(this RemoteDeploymentManager deploymentMana
             }
             finally
             {
-                // Stop listenting
-                deploymentManager.Stop();
+                if (Interlocked.Exchange(ref handler, null) != null)
+                {
+                    deploymentManager.StatusChanged -= handler;
+                    // Stop listenting
+                    deploymentManager.Stop();
+                }
             }
         }