Skip to content

Commit bad6836

Browse files
vladimir-shcherbakovvladimir-shcherbakov
committed
PR commetns fixed
1 parent 66caf28 commit bad6836

File tree

5 files changed

+28
-31
lines changed

5 files changed

+28
-31
lines changed

‎src/Compute/Compute.Test/ScenarioTests/ComputeTestRunner.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
using System;
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
215
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
616
using Microsoft.Azure.Commands.TestFx;
717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
818
using Xunit.Abstractions;
@@ -28,9 +38,6 @@ protected ComputeTestRunner(ITestOutputHelper output)
2838
.WithNewRmModules (helper => new[]
2939
{
3040
helper.RMProfileModule,
31-
#if !NETSTANDARD
32-
helper.RMStorageDataPlaneModule,
33-
#endif
3441
helper.GetRMModulePath("AzureRM.Compute.psd1"),
3542
helper.GetRMModulePath("AzureRM.Network.psd1"),
3643
helper.GetRMModulePath("AzureRM.KeyVault.psd1"),

‎src/Compute/Compute.Test/ScenarioTests/LogAnalyticTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public LogAnalyticTests(Xunit.Abstractions.ITestOutputHelper output)
2929
public void TestExportLogAnalyticThrottledRequestsNegative()
3030
{
3131
TestRunner.RunTestScript("Test-ExportLogAnalyticThrottledRequestsNegative");
32-
3332
}
3433

3534
[Fact]

‎src/Compute/Compute.Test/ScenarioTests/RunnerTests.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
using Microsoft.Azure.ServiceManagement.Common.Models;
2-
using Microsoft.IdentityModel.Clients.ActiveDirectory;
3-
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
415
using Microsoft.WindowsAzure.Commands.ScenarioTest;
516
using System;
617
using System.Collections.Generic;
@@ -11,12 +22,8 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
1122
{
1223
public class RunnerTests
1324
{
14-
XunitTracingInterceptor _logger;
15-
1625
public RunnerTests(Xunit.Abstractions.ITestOutputHelper output)
1726
{
18-
_logger = new XunitTracingInterceptor(output);
19-
XunitTracingInterceptor.AddToContext(_logger);
2027
}
2128

2229
[Fact]

‎src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using Microsoft.Azure.Test.HttpRecorder;
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1818
using System;
19-
using System.Diagnostics;
2019
using System.Reflection;
2120
using Xunit;
2221

@@ -34,7 +33,6 @@ public StrategiesVirtualMachineTests(Xunit.Abstractions.ITestOutputHelper output
3433
public void TestSimpleNewVm()
3534
{
3635
TestRunner.RunTestScript("Test-SimpleNewVm");
37-
3836
}
3937

4038
[Fact]
@@ -146,7 +144,6 @@ string GetUnigueId() {
146144
create.SetValue(null, (Func<string>) GetUnigueId);
147145
TestRunner.RunTestScript("Test-SimpleNewVmWithDefaultDomainName2");
148146
create.SetValue(null, oldCreate);
149-
150147
}
151148

152149
[Fact]

‎src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,64 +13,53 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.Common.Strategies;
16-
using Microsoft.Azure.ServiceManagement.Common.Models;
1716
using Microsoft.Azure.Test.HttpRecorder;
1817
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1918
using System;
20-
using System.Diagnostics;
2119
using System.Reflection;
2220
using Xunit;
2321

2422
namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
2523
{
2624
public class StrategiesVmssTests : ComputeTestRunner
2725
{
28-
XunitTracingInterceptor _logger;
29-
3026
public StrategiesVmssTests(Xunit.Abstractions.ITestOutputHelper output)
3127
: base(output)
3228
{
33-
_logger = new XunitTracingInterceptor(output);
34-
XunitTracingInterceptor.AddToContext(_logger);
3529
}
3630

3731
[Fact]
3832
[Trait(Category.AcceptanceType, Category.CheckIn)]
3933
public void TestSimpleNewVmss()
4034
{
41-
// ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmss");
4235
TestRunner.RunTestScript("Test-SimpleNewVmss");
4336
}
4437

4538
[Fact]
4639
[Trait(Category.AcceptanceType, Category.CheckIn)]
4740
public void TestSimpleNewVmssFromSIGImage()
4841
{
49-
// ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmssFromSIGImage");
5042
TestRunner.RunTestScript("Test-SimpleNewVmssFromSIGImage");
5143
}
5244

5345
[Fact]
5446
[Trait(Category.AcceptanceType, Category.CheckIn)]
5547
public void TestSimpleNewVmssWithUltraSSD()
5648
{
57-
// ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmssWithUltraSSD");
5849
TestRunner.RunTestScript("Test-SimpleNewVmssWithUltraSSD");
5950
}
6051

6152
[Fact]
6253
[Trait(Category.AcceptanceType, Category.CheckIn)]
6354
public void TestSimpleNewVmssLbErrorScenario()
6455
{
65-
// ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmssLbErrorScenario");
6656
TestRunner.RunTestScript("Test-SimpleNewVmssLbErrorScenario");
6757
}
6858

6959
[Fact]
7060
[Trait(Category.AcceptanceType, Category.CheckIn)]
7161
public void TestSimpleNewVmssWithSystemAssignedIdentity()
7262
{
73-
// ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmssWithSystemAssignedIdentity");
7463
TestRunner.RunTestScript("Test-SimpleNewVmssWithSystemAssignedIdentity");
7564
}
7665

@@ -79,7 +68,6 @@ public void TestSimpleNewVmssWithSystemAssignedIdentity()
7968
[Trait(Category.AcceptanceType, Category.CheckIn)]
8069
public void TestSimpleNewVmssImageName()
8170
{
82-
// ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmssImageName");
8371
TestRunner.RunTestScript("Test-SimpleNewVmssImageName");
8472
}
8573

@@ -102,7 +90,6 @@ public void TestSimpleNewVmssWithSystemAssignedUserAssignedIdentity()
10290
* Get-AzUserAssignedIdentity -ResourceGroupName UAITG123456 -Name UAITG123456Identity
10391
* Nore down the Id and use it in the PS code
10492
* */
105-
// ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmssWithsystemAssignedUserAssignedIdentity");
10693
TestRunner.RunTestScript("Test-SimpleNewVmssWithsystemAssignedUserAssignedIdentity");
10794
}
10895

0 commit comments

Comments
 (0)