Ignore server status during polling checks when the TaskState property is not null

Author: sharwell

src/corelib/Providers/Rackspace/CloudServersProvider.cs

@@ -331,7 +331,7 @@ public Server WaitForServerState(string serverId, ServerState[] expectedStates,
 
             int count = 0;
             int currentProgress = -1;
-            while (!expectedStates.Contains(serverDetails.Status) && !errorStates.Contains(serverDetails.Status) && count < refreshCount)
+            while ((serverDetails.TaskState != null || (!expectedStates.Contains(serverDetails.Status) && !errorStates.Contains(serverDetails.Status))) && count < refreshCount)
             {
                 if (progressUpdatedCallback != null)
                 {

src/testing/integration/Providers/Rackspace/UserServerTests.cs

@@ -211,7 +211,7 @@ public void TestRescueServer()
 
             string rescueResult = provider.RescueServer(_server.Id);
             Assert.IsFalse(string.IsNullOrEmpty(rescueResult));
-            Server rescueServer = provider.WaitForServerState(_server.Id, ServerState.Rescue, new[] { ServerState.Error });
+            Server rescueServer = provider.WaitForServerState(_server.Id, ServerState.Rescue, new[] { ServerState.Active, ServerState.Error, ServerState.Unknown, ServerState.Suspended });
             Assert.AreEqual(ServerState.Rescue, rescueServer.Status);
 
             bool unrescueResult = provider.UnRescueServer(_server.Id);
@@ -325,7 +325,7 @@ public void TestConfirmServerResize()
 
             bool resized = provider.ResizeServer(_server.Id, serverName, flavor.Id);
             Assert.IsTrue(resized);
-            Server resizedServer = provider.WaitForServerState(_server.Id, ServerState.VerifyResize, new[] { ServerState.Error, ServerState.Unknown, ServerState.Suspended });
+            Server resizedServer = provider.WaitForServerState(_server.Id, ServerState.VerifyResize, new[] { ServerState.Active, ServerState.Error, ServerState.Unknown, ServerState.Suspended });
             Assert.AreEqual(ServerState.VerifyResize, resizedServer.Status);
             _server = resizedServer;
 
@@ -351,7 +351,7 @@ public void TestRevertServerResize()
 
             bool resized = provider.ResizeServer(_server.Id, serverName, flavor.Id);
             Assert.IsTrue(resized);
-            Server resizedServer = provider.WaitForServerState(_server.Id, ServerState.VerifyResize, new[] { ServerState.Error, ServerState.Unknown, ServerState.Suspended });
+            Server resizedServer = provider.WaitForServerState(_server.Id, ServerState.VerifyResize, new[] { ServerState.Active, ServerState.Error, ServerState.Unknown, ServerState.Suspended });
             Assert.AreEqual(ServerState.VerifyResize, resizedServer.Status);
             _server = resizedServer;