[Release 1.6.0] Fixed ParseTemplateParameterFileContents_DeserializeWithCorrectType test flakiness. (#2571)

* Fixed ParseTemplateParameterFileContents_DeserializeWithCorrectType test flakiness.
* fixed SaveAzureWebsiteLogWithNoFileExtensionTest flakiness

Author: Hovsep

src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/GalleryTemplatesClientTests.cs

@@ -31,6 +31,7 @@
 using Xunit;
 using Xunit.Abstractions;
 using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Resources.Test.Models
 {
@@ -503,7 +504,7 @@ public void ParseTemplateParameterFileContents_DeserializeWithCorrectType()
             TestExecutionHelpers.RetryAction(() =>
             {
                 Dictionary<string, TemplateFileParameterV1> result =
-                    TemplateUtility.ParseTemplateParameterFileContents(@"Resources\WebSite.param.dev.json");
+                    TemplateUtility.ParseTemplateParameterFileContents(@"Resources\WebSite.param.dev.json".AsAbsoluteLocation());
                 Assert.Equal(true, result["isWorker"].Value);
                 Assert.Equal((System.Int64) 1, result["numberOfWorker"].Value);
             });

src/ServiceManagement/Services/Commands.Test/Websites/SaveAzureWebsiteLogTests.cs

@@ -28,10 +28,11 @@
 using Microsoft.WindowsAzure.Commands.Websites;
 using Moq;
 using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.WindowsAzure.Commands.Common.Test;
 
 namespace Microsoft.WindowsAzure.Commands.Test.Websites
 {
-    
+
     public class SaveAzureWebsiteLogTests : WebsitesTestBase
     {
         private Site site1 = new Site
@@ -83,13 +84,13 @@ public void SaveAzureWebsiteLogTest()
             // Test
             SaveAzureWebsiteLogCommand getAzureWebsiteLogCommand = new SaveAzureWebsiteLogCommand(deploymentChannel)
             {
-                Name = "website1", 
+                Name = "website1",
                 ShareChannel = true,
                 WebsitesClient = clientMock.Object,
                 CommandRuntime = new MockCommandRuntime(),
             };
             currentProfile = new AzureSMProfile();
-            var subscription = new AzureSubscription{Id = new Guid(base.subscriptionId) };
+            var subscription = new AzureSubscription { Id = new Guid(base.subscriptionId) };
             subscription.Properties[AzureSubscription.Property.Default] = "True";
             currentProfile.Subscriptions[new Guid(base.subscriptionId)] = subscription;
 
@@ -103,61 +104,69 @@ public void SaveAzureWebsiteLogTest()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SaveAzureWebsiteLogWithNoFileExtensionTest()
         {
-            // Setup
-            string expectedOutput = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "file_without_ext.zip");
-
-            SimpleDeploymentServiceManagement deploymentChannel = new SimpleDeploymentServiceManagement
-            {
-                DownloadLogsThunk = ar => new MemoryStream(Encoding.UTF8.GetBytes("test with no extension"))
-            };
-
-            // Test
-            SaveAzureWebsiteLogCommand getAzureWebsiteLogCommand = new SaveAzureWebsiteLogCommand(deploymentChannel)
-            {
-                Name = "website1",
-                ShareChannel = true,
-                WebsitesClient = clientMock.Object,
-                CommandRuntime = new MockCommandRuntime(),
-                Output = "file_without_ext"
-            };
-            currentProfile = new AzureSMProfile();
-            var subscription = new AzureSubscription{Id = new Guid(base.subscriptionId) };
-            subscription.Properties[AzureSubscription.Property.Default] = "True";
-            currentProfile.Subscriptions[new Guid(base.subscriptionId)] = subscription;
-
-            getAzureWebsiteLogCommand.DefaultCurrentPath = AppDomain.CurrentDomain.BaseDirectory;
-            getAzureWebsiteLogCommand.ExecuteCmdlet();
-            Assert.Equal("test with no extension", FileUtilities.DataStore.ReadFileAsText(expectedOutput));
+            TestExecutionHelpers.RetryAction(
+               () =>
+               {
+                   // Setup
+                   string expectedOutput = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "file_without_ext.zip");
+
+                   SimpleDeploymentServiceManagement deploymentChannel = new SimpleDeploymentServiceManagement
+                   {
+                       DownloadLogsThunk = ar => new MemoryStream(Encoding.UTF8.GetBytes("test with no extension"))
+                   };
+
+                   // Test
+                   SaveAzureWebsiteLogCommand getAzureWebsiteLogCommand = new SaveAzureWebsiteLogCommand(deploymentChannel)
+                   {
+                       Name = "website1",
+                       ShareChannel = true,
+                       WebsitesClient = clientMock.Object,
+                       CommandRuntime = new MockCommandRuntime(),
+                       Output = "file_without_ext"
+                   };
+                   currentProfile = new AzureSMProfile();
+                   var subscription = new AzureSubscription { Id = new Guid(base.subscriptionId) };
+                   subscription.Properties[AzureSubscription.Property.Default] = "True";
+                   currentProfile.Subscriptions[new Guid(base.subscriptionId)] = subscription;
+
+                   getAzureWebsiteLogCommand.DefaultCurrentPath = AppDomain.CurrentDomain.BaseDirectory;
+                   getAzureWebsiteLogCommand.ExecuteCmdlet();
+                   Assert.Equal("test with no extension", FileUtilities.DataStore.ReadFileAsText(expectedOutput));
+               });
         }
 
-        [Fact(Skip = "Flaky test")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SaveAzureWebsiteLogWithSlotTest()
         {
-            // Setup
-            SimpleDeploymentServiceManagement deploymentChannel = new SimpleDeploymentServiceManagement
-            {
-                DownloadLogsThunk = ar => new MemoryStream(Encoding.UTF8.GetBytes("test"))
-            };
-
-            // Test
-            SaveAzureWebsiteLogCommand getAzureWebsiteLogCommand = new SaveAzureWebsiteLogCommand(deploymentChannel)
-            {
-                Name = "website1",
-                ShareChannel = true,
-                WebsitesClient = clientMock.Object,
-                CommandRuntime = new MockCommandRuntime(),
-                Slot = slot
-            };
-            currentProfile = new AzureSMProfile();
-            var subscription = new AzureSubscription{Id = new Guid(base.subscriptionId) };
-            subscription.Properties[AzureSubscription.Property.Default] = "True";
-            currentProfile.Subscriptions[new Guid(base.subscriptionId)] = subscription;
-
-            getAzureWebsiteLogCommand.DefaultCurrentPath = AppDomain.CurrentDomain.BaseDirectory;
-            getAzureWebsiteLogCommand.ExecuteCmdlet();
-            Assert.Equal("test", FileUtilities.DataStore.ReadFileAsText(
-                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, SaveAzureWebsiteLogCommand.DefaultOutput)));
+            TestExecutionHelpers.RetryAction(
+               () =>
+               {
+                   // Setup
+                   SimpleDeploymentServiceManagement deploymentChannel = new SimpleDeploymentServiceManagement
+                   {
+                       DownloadLogsThunk = ar => new MemoryStream(Encoding.UTF8.GetBytes("test"))
+                   };
+
+                   // Test
+                   SaveAzureWebsiteLogCommand getAzureWebsiteLogCommand = new SaveAzureWebsiteLogCommand(deploymentChannel)
+                   {
+                       Name = "website1",
+                       ShareChannel = true,
+                       WebsitesClient = clientMock.Object,
+                       CommandRuntime = new MockCommandRuntime(),
+                       Slot = slot
+                   };
+                   currentProfile = new AzureSMProfile();
+                   var subscription = new AzureSubscription { Id = new Guid(base.subscriptionId) };
+                   subscription.Properties[AzureSubscription.Property.Default] = "True";
+                   currentProfile.Subscriptions[new Guid(base.subscriptionId)] = subscription;
+
+                   getAzureWebsiteLogCommand.DefaultCurrentPath = AppDomain.CurrentDomain.BaseDirectory;
+                   getAzureWebsiteLogCommand.ExecuteCmdlet();
+                   Assert.Equal("test", FileUtilities.DataStore.ReadFileAsText(
+                       Path.Combine(AppDomain.CurrentDomain.BaseDirectory, SaveAzureWebsiteLogCommand.DefaultOutput)));
+               });
         }
     }
 }