Skip to content

Commit e020b32

Browse files
cormacpaynecormacpayne
authored
Merge branch 'release-6.1.0' into apim_2018_01_01
2 parents c5169ce + 61191c8 commit e020b32

File tree

221 files changed

+133804
-2878572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+133804
-2878572
lines changed

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchApplicationPackageTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void TestUpdateApplicationPackage()
8585
TestUtilities.GetCurrentMethodName());
8686
}
8787

88-
[Fact]
88+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
8989
[Trait(Category.AcceptanceType, Category.Flaky)]
9090
public void TestCreatePoolWithApplicationPackage()
9191
{
@@ -114,7 +114,7 @@ public void TestCreatePoolWithApplicationPackage()
114114
TestUtilities.GetCurrentMethodName());
115115
}
116116

117-
[Fact]
117+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
118118
[Trait(Category.AcceptanceType, Category.Flaky)]
119119
public void TestUpdatePoolWithApplicationPackage()
120120
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/CertificateTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ public CertificateTests(Xunit.Abstractions.ITestOutputHelper output)
2727
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
2828
}
2929

30-
[Fact]
30+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3131
[Trait(Category.AcceptanceType, Category.Flaky)]
3232
public void TestCertificateCrudOperations()
3333
{
3434
BatchController.NewInstance.RunPsTest("Test-CertificateCrudOperations");
3535
}
3636

37-
[Fact]
37+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3838
[Trait(Category.AcceptanceType, Category.Flaky)]
3939
public void TestCancelCertificateDelete()
4040
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ComputeNodeTests(Xunit.Abstractions.ITestOutputHelper output)
2828
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
2929
}
3030

31-
[Fact]
31+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3232
[Trait(Category.AcceptanceType, Category.Flaky)]
3333
public void TestRemoveComputeNodes()
3434
{
@@ -51,7 +51,7 @@ public void TestRemoveComputeNodes()
5151
TestUtilities.GetCurrentMethodName());
5252
}
5353

54-
[Fact]
54+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
5555
[Trait(Category.AcceptanceType, Category.Flaky)]
5656
public void TestRebootAndReimageComputeNode()
5757
{
@@ -74,7 +74,7 @@ public void TestRebootAndReimageComputeNode()
7474
TestUtilities.GetCurrentMethodName());
7575
}
7676

77-
[Fact]
77+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
7878
[Trait(Category.AcceptanceType, Category.Flaky)]
7979
public void TestDisableAndEnableComputeNodeScheduling()
8080
{
@@ -94,7 +94,7 @@ public void TestDisableAndEnableComputeNodeScheduling()
9494
TestUtilities.GetCurrentMethodName());
9595
}
9696

97-
[Fact]
97+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
9898
[Trait(Category.AcceptanceType, Category.Flaky)]
9999
public void TestGetComputeNodeRemoteLoginSettings()
100100
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public ComputeNodeUserTests(Xunit.Abstractions.ITestOutputHelper output)
2727
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
2828
}
2929

30-
[Fact]
30+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3131
[Trait(Category.AcceptanceType, Category.Flaky)]
3232
public void TestComputeNodeUserEndToEnd()
3333
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public FileTests(Xunit.Abstractions.ITestOutputHelper output)
2929
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
3030
}
3131

32-
[Fact]
32+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3333
[Trait(Category.AcceptanceType, Category.Flaky)]
3434
public void TestGetNodeFileContentByTask()
3535
{
@@ -57,7 +57,7 @@ public void TestGetNodeFileContentByTask()
5757
TestUtilities.GetCurrentMethodName());
5858
}
5959

60-
[Fact]
60+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
6161
[Trait(Category.AcceptanceType, Category.Flaky)]
6262
public void TestGetNodeFileContentByComputeNode()
6363
{
@@ -76,7 +76,7 @@ public void TestGetNodeFileContentByComputeNode()
7676
TestUtilities.GetCurrentMethodName());
7777
}
7878

79-
[Fact]
79+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
8080
[Trait(Category.AcceptanceType, Category.Flaky)]
8181
public void TestGetRemoteDesktopProtocolFile()
8282
{
@@ -95,7 +95,7 @@ public void TestGetRemoteDesktopProtocolFile()
9595
TestUtilities.GetCurrentMethodName());
9696
}
9797

98-
[Fact]
98+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
9999
[Trait(Category.AcceptanceType, Category.Flaky)]
100100
public void TestDeleteNodeFileByTask()
101101
{
@@ -122,7 +122,7 @@ public void TestDeleteNodeFileByTask()
122122
TestUtilities.GetCurrentMethodName());
123123
}
124124

125-
[Fact]
125+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
126126
[Trait(Category.AcceptanceType, Category.Flaky)]
127127
public void TestDeleteNodeFileByComputeNode()
128128
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public JobScheduleTests(Xunit.Abstractions.ITestOutputHelper output)
2525
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
2626
}
2727

28-
[Fact]
28+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
2929
[Trait(Category.AcceptanceType, Category.Flaky)]
3030
public void TestJobScheduleCRUD()
3131
{
3232
BatchController.NewInstance.RunPsTest("Test-JobScheduleCRUD");
3333
}
3434

3535

36-
[Fact]
36+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3737
[Trait(Category.AcceptanceType, Category.Flaky)]
3838
public void TestDisableEnableTerminateJobSchedule()
3939
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ public JobTests(Xunit.Abstractions.ITestOutputHelper output)
2727
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
2828
}
2929

30-
[Fact]
30+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3131
[Trait(Category.AcceptanceType, Category.Flaky)]
3232
public void TestJobCRUD()
3333
{
3434
BatchController.NewInstance.RunPsTest("Test-JobCRUD");
3535
}
3636

3737

38-
[Fact]
38+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3939
[Trait(Category.AcceptanceType, Category.Flaky)]
4040
public void TestDisableEnableTerminateJob()
4141
{
@@ -58,7 +58,7 @@ public void TestDisableEnableTerminateJob()
5858
TestUtilities.GetCurrentMethodName());
5959
}
6060

61-
[Fact]
61+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
6262
[Trait(Category.AcceptanceType, Category.Flaky)]
6363
public void IfJobSetsAutoFailure_ItCompletesWhenAnyTaskFails()
6464
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public PoolTests(Xunit.Abstractions.ITestOutputHelper output)
3030
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
3131
}
3232

33-
[Fact]
33+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
3434
[Trait(Category.AcceptanceType, Category.Flaky)]
3535
public void TestPoolCRUD()
3636
{
3737
BatchController.NewInstance.RunPsTest("Test-PoolCRUD");
3838
}
3939

40-
[Fact]
40+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
4141
[Trait(Category.AcceptanceType, Category.Flaky)]
4242
public void TestResizeAndStopResizePool()
4343
{
@@ -59,7 +59,7 @@ public void TestResizeAndStopResizePool()
5959
TestUtilities.GetCurrentMethodName());
6060
}
6161

62-
[Fact]
62+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
6363
[Trait(Category.AcceptanceType, Category.Flaky)]
6464
public void TestAutoScaleActions()
6565
{
@@ -81,7 +81,7 @@ public void TestAutoScaleActions()
8181
TestUtilities.GetCurrentMethodName());
8282
}
8383

84-
[Fact]
84+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
8585
[Trait(Category.AcceptanceType, Category.Flaky)]
8686
public void TestChangeOSVersion()
8787
{

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public TaskTests(Xunit.Abstractions.ITestOutputHelper output)
2525
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
2626
}
2727

28-
[Fact]
28+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
2929
[Trait(Category.AcceptanceType, Category.Flaky)]
3030
public void TestTaskCRUD()
3131
{
@@ -47,7 +47,7 @@ public void TestTaskCRUD()
4747
TestUtilities.GetCurrentMethodName());
4848
}
4949

50-
[Fact]
50+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
5151
[Trait(Category.AcceptanceType, Category.Flaky)]
5252
public void TestCreateTaskCollection()
5353
{
@@ -69,7 +69,7 @@ public void TestCreateTaskCollection()
6969
TestUtilities.GetCurrentMethodName());
7070
}
7171

72-
[Fact]
72+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
7373
[Trait(Category.AcceptanceType, Category.Flaky)]
7474
public void TestTerminateTask()
7575
{
@@ -96,7 +96,7 @@ public void TestTerminateTask()
9696
TestUtilities.GetCurrentMethodName());
9797
}
9898

99-
[Fact]
99+
[Fact(Skip = "Need Batch team to re-record failing test. See the following issue: https://github.com/Azure/azure-powershell/issues/5006")]
100100
[Trait(Category.AcceptanceType, Category.Flaky)]
101101
public void TestListAllSubtasks()
102102
{

‎src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/AzureRmProfile.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ public string ToString(bool serializeCache)
317317
public void Clear()
318318
{
319319
Contexts.Clear();
320+
DefaultContextKey = "Default";
320321
DefaultContext = new AzureContext();
321322
EnvironmentTable.Clear();
322323
foreach (var environment in AzureEnvironment.PublicEnvironments)

0 commit comments

Comments
 (0)