Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev

Author: huangpf

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMSqlServerExtensionTests.cs

@@ -58,7 +58,7 @@ public void TestCleanUp()
         }
 
 
-        [TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set,Remove)-AzureVMSqlServerExtension)")]
+        [TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set,Remove)-AzureVMSqlServerExtension)")]
         public void GetAzureVMSqlServerExtensionTest()
         {
             try
@@ -97,7 +97,7 @@ public void GetAzureVMSqlServerExtensionTest()
             }
         }
 
-        [TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
+        [TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
         public void UpdateVMWithSqlServerExtensionTest()
         {
             try
@@ -130,7 +130,7 @@ public void UpdateVMWithSqlServerExtensionTest()
             }
         }
 
-        [TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
+        [TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
         public void AddRoleWithSqlServerExtensionTest()
         {
             try
@@ -161,7 +161,7 @@ public void AddRoleWithSqlServerExtensionTest()
         }
 
 
-        [TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
+        [TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
         public void UpdateRoleWithSqlServerExtensionTest()
         {
             try

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs

@@ -55,14 +55,31 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
 
     public class ServiceManagementCmdletTestHelper
     {
+        private T RunPSCmdletAndReturnFirst<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false, bool retryOnConflict = true)
+        {
+            var result = default(T);
+            if (retryOnConflict)
+            {
+                Utilities.RetryActionUntilSuccess(
+                   () => result = RunPSCmdletAndReturnFirstHelper<T>(cmdlet),
+                   "ConflictError", 3, 60);
+            }
+            else
+            {
+                result = RunPSCmdletAndReturnFirstHelper<T>(cmdlet);
+            }
+            return result;
+
+        }
+
         /// <summary>
         /// Run a powershell cmdlet that returns the first PSObject as a return value.
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="cmdlet"></param>
         /// <param name="debug"></param>
         /// <returns></returns>
-        private T RunPSCmdletAndReturnFirst<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
+        private T RunPSCmdletAndReturnFirstHelper<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
         {
             var azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(cmdlet);
             Collection<PSObject> result = azurePowershellCmdlet.Run(debug);
@@ -91,14 +108,31 @@ private T RunPSCmdletAndReturnFirst<T>(PowershellCore.CmdletsInfo cmdlet, bool d
             return default(T);
         }
 
+        private Collection<T> RunPSCmdletAndReturnAll<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false, bool retryOnConflict = true)
+        {
+            var result = new Collection<T>();
+            if (retryOnConflict)
+            {
+                Utilities.RetryActionUntilSuccess(
+                   () => result = RunPSCmdletAndReturnAllHelper<T>(cmdlet),
+                   "ConflictError", 3, 60);
+            }
+            else
+            {
+                result = RunPSCmdletAndReturnAllHelper<T>(cmdlet);
+            }
+            return result;
+        }
+
+
         /// <summary>
         /// Run a powershell cmdlet that returns a collection of PSObjects as a return value.
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="cmdlet"></param>
         /// <param name="debug"></param>
         /// <returns></returns>
-        private Collection<T> RunPSCmdletAndReturnAll<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
+        private Collection<T> RunPSCmdletAndReturnAllHelper<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
         {
             var azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(cmdlet);
             Collection<PSObject> result = azurePowershellCmdlet.Run(debug);
@@ -1314,9 +1348,7 @@ public SM.PersistentVMRoleContext ExportAzureVM(string vmName, string serviceNam
         public ManagementOperationContext UpdateAzureVM(string vmName, string serviceName, SM.PersistentVM persistentVM)
         {
             ManagementOperationContext result = new ManagementOperationContext();
-            Utilities.RetryActionUntilSuccess(
-                () => result = RunPSCmdletAndReturnFirst<ManagementOperationContext>(new UpdateAzureVMCmdletInfo(vmName, serviceName, persistentVM)),
-                "409", 3, 60);
+            result = RunPSCmdletAndReturnFirst<ManagementOperationContext>(new UpdateAzureVMCmdletInfo(vmName, serviceName, persistentVM));
             return result;
         }
 

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/Utilities.cs

@@ -586,7 +586,7 @@ public static void RetryActionUntilSuccess(Action act, string errorMessage, int
                 }
                 catch (Exception e)
                 {
-                    if (e.ToString().Contains(errorMessage))
+                    if (e.ToString().Contains(errorMessage) || (e.InnerException != null && e.InnerException.ToString().Contains(errorMessage)))
                     {
                         Console.WriteLine("{0} error occurs! retrying ...", errorMessage);
                         if (e.InnerException != null)