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

Author: unknown

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

@@ -89,6 +89,56 @@ public TestContext TestContext
         public static void AssemblyInit(TestContext context)
         {
             SetTestSettings();
+
+            vmPowershellCmdlets = new ServiceManagementCmdletTestHelper();
+
+            try
+            {
+                vmPowershellCmdlets.RunPSScript("Get-AzureService | Remove-AzureService -Force");
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                vmPowershellCmdlets.RunPSScript("Get-AzureDisk | Remove-AzureDisk");
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                vmPowershellCmdlets.RunPSScript(@"Get-AzureVMImage | where {$_.Category -eq 'User'} | Remove-AzureVMImage");
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                vmPowershellCmdlets.RunPSScript("Remove-AzureVNetConfig");
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                vmPowershellCmdlets.RunPSScript("Get-AzureAffinityGroup | Remove-AzureAffinityGroup");
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                vmPowershellCmdlets.RunPSScript("Get-AzureReservedIP | Remove-AzureReservedIP -Force");
+            }
+            catch
+            {
+            }
         }
 
         [AssemblyCleanup]

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/UnitTests/Cmdlets/IaaS/Extensions/VirtualMachineExtensionImageFactoryTests.cs

@@ -77,7 +77,7 @@ public void CleanupTest()
         }
 
         [TestMethod]
-        [TestCategory(Category.Functional)]
+        [TestCategory(Category.Sequential)]
         public void TestNonExistingExtensionImageList()
         {
             var factory = new VirtualMachineExtensionImageFactory(client.Object);
@@ -91,7 +91,7 @@ public void TestNonExistingExtensionImageList()
         }
 
         [TestMethod]
-        [TestCategory(Category.Functional)]
+        [TestCategory(Category.Sequential)]
         public void TestMakeListWithoutClient()
         {
             var factory = new VirtualMachineExtensionImageFactory(null);
@@ -105,7 +105,7 @@ public void TestMakeListWithoutClient()
         }
 
         [TestMethod]
-        [TestCategory(Category.Functional)]
+        [TestCategory(Category.Sequential)]
         public void TestMakeListWithClient()
         {
             var factory = new VirtualMachineExtensionImageFactory(client.Object);