Skip to content

Commit 22cb4aa

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#7290 from EvgenyAgafonchikov/skipped-fixes
Un-skipped working tests, re-recorded
2 parents 9b42fa4 + 4340d9f commit 22cb4aa

File tree

14 files changed

+9101
-4253
lines changed

14 files changed

+9101
-4253
lines changed

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,18 @@
340340
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDPublicStandardSku.json">
341341
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
342342
</None>
343+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.MultiIpConfigOnNicTests\TestAddNICToLBWithMultiIpConfig.json">
344+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
345+
</None>
346+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.MultiIpConfigOnNicTests\TestLBWithMultiIpConfigMultiNIC.json">
347+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
348+
</None>
349+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.MultiIpConfigOnNicTests\TestLBWithMultiIpConfigNICCRUD.json">
350+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
351+
</None>
352+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.MultiIpConfigOnNicTests\TestMultiIpConfigCRUD.json">
353+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
354+
</None>
343355
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkCloudExceptionTests\TestDuplicateResource.json">
344356
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
345357
</None>

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/CortexTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public CortexTests(ITestOutputHelper output)
3030
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
3131
}
3232

33-
[Fact( Skip = "TODO, #7260: needs to be re-recorded")]
33+
[Fact(Skip = "TODO, #7260: needs to be re-recorded")]
3434
[Trait(Category.Owner, Category.brooklynft)]
3535
public void TestCortexCRUD()
3636
{

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/LoadBalancerTests.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,19 +189,17 @@ public void TestSetLoadBalancerCRUDInternalBasicSku()
189189
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalBasicSku");
190190
}
191191

192-
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
192+
[Fact]
193193
[Trait(Category.AcceptanceType, Category.CheckIn)]
194194
[Trait(Category.Owner, Category.slbdev)]
195-
[Trait("Re-record", "ClientRuntime changes")]
196195
public void TestSetLoadBalancerCRUDPublicStandardSku()
197196
{
198197
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-PublicStandardSku");
199198
}
200199

201-
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
200+
[Fact]
202201
[Trait(Category.AcceptanceType, Category.CheckIn)]
203202
[Trait(Category.Owner, Category.slbdev)]
204-
[Trait("Re-record", "ClientRuntime changes")]
205203
public void TestSetLoadBalancerCRUDInternalStandardSku()
206204
{
207205
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalStandardSku");
@@ -215,10 +213,9 @@ public void TestLoadBalancerCRUDInternalHighlyAvailableBasicSku()
215213
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalHighlyAvailableBasicSku");
216214
}
217215

218-
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
216+
[Fact]
219217
[Trait(Category.AcceptanceType, Category.CheckIn)]
220218
[Trait(Category.Owner, Category.slbdev)]
221-
[Trait("Re-record", "ClientRuntime changes")]
222219
public void TestLoadBalancerCRUDInternalHighlyAvailableStandardSku()
223220
{
224221
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalHighlyAvailableStandardSku");

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/MultiIpConfigOnNicTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ public MultiIpConfigOnNicTests(ITestOutputHelper output)
2929
XunitTracingInterceptor.AddToContext(_logger);
3030
}
3131

32-
[Fact(Skip = "NRP code to be there to test this scenario, skipping it until NRP is ready")]
32+
[Fact]
3333
[Trait(Category.AcceptanceType, Category.CheckIn)]
3434
[Trait(Category.Owner, Category.sdnnrp)]
3535
public void TestMultiIpConfigCRUD()
3636
{
3737
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-MultiIpConfigCRUD");
3838
}
3939

40-
[Fact(Skip = "NRP code to be there to test this scenario, skipping it until NRP is ready")]
40+
[Fact]
4141
/// current error is: LoadBalancingRules are not supported for secondary IpConfigurations.
4242
[Trait(Category.AcceptanceType, Category.CheckIn)]
4343
[Trait(Category.Owner, Category.sdnnrp)]
@@ -47,15 +47,15 @@ public void TestLBWithMultiIpConfigNICCRUD()
4747
}
4848

4949

50-
[Fact(Skip = "NRP code to be there to test this scenario, skipping it until NRP is ready")]
50+
[Fact]
5151
[Trait(Category.AcceptanceType, Category.CheckIn)]
5252
[Trait(Category.Owner, Category.sdnnrp)]
5353
public void TestAddNICToLBWithMultiIpConfig()
5454
{
5555
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-AddNICToLBWithMultiIpConfig");
5656
}
5757

58-
[Fact(Skip = "NRP code to be there to test this scenario, skipping it until NRP is ready")]
58+
[Fact]
5959
[Trait(Category.AcceptanceType, Category.CheckIn)]
6060
[Trait(Category.Owner, Category.sdnnrp)]
6161
/// Public IP is not supported on secondary IpConfigurations

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/MultiIpConfigOnNicTests.ps1

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@ function Test-LBWithMultiIpConfigMultiNIC
264264
Assert-AreEqual $nic.IpConfigurations[0].Subnet.Id $vnet.Subnets[0].Id
265265
Assert-AreEqual $nic.IpConfigurations[0].Id $vnet.Subnets[0].IpConfigurations[0].Id
266266
Assert-AreEqual $nic.IpConfigurations[1].Subnet.Id $vnet.Subnets[0].Id
267-
Assert-AreEqual $nic.IpConfigurations[1].Id $vnet.Subnets[0].IpConfigurations[0].Id
268-
267+
Assert-AreEqual $nic.IpConfigurations[1].Id $vnet.Subnets[0].IpConfigurations[1].Id
269268

270269
# Verify ipconfigs
271270
Assert-AreEqual 2 @($nic.IpConfigurations).Count
@@ -277,11 +276,7 @@ function Test-LBWithMultiIpConfigMultiNIC
277276
Assert-AreEqual "Dynamic" $nic.IpConfigurations[0].PrivateIpAllocationMethod
278277
Assert-AreEqual $nic.IpConfigurations[0].PrivateIpAddressVersion IPv4
279278
Assert-AreEqual $nic.IpConfigurations[1].PrivateIpAddressVersion IPv4
280-
281279
Assert-AreEqual $ipconfig2Name $nic.IpConfigurations[1].Name
282-
Assert-Null $nic.IpConfigurations[1].PublicIpAddress
283-
Assert-Null $nic.IpConfigurations[1].Subnet
284-
Assert-AreEqual $nic.IpConfigurations[1].PrivateIpAddressVersion IPv6
285280

286281
# Delete NetworkInterface
287282
$delete = Remove-AzureRmNetworkInterface -ResourceGroupName $rgname -name $nicName -PassThru -Force

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/PublicIpAddressTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void TestPublicIpBasicSku()
110110
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-BasicSku");
111111
}
112112

113-
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
113+
[Fact]
114114
[Trait(Category.AcceptanceType, Category.CheckIn)]
115115
[Trait(Category.Owner, Category.sdnnrp)]
116116
[Trait("Re-record", "ClientRuntime changes")]

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestLoadBalancerCRUDInternalHighlyAvailableStandardSku.json

Lines changed: 729 additions & 487 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestSetLoadBalancerCRUDInternalStandardSku.json

Lines changed: 652 additions & 407 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.LoadBalancerTests/TestSetLoadBalancerCRUDPublicStandardSku.json

Lines changed: 822 additions & 499 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.MultiIpConfigOnNicTests/TestAddNICToLBWithMultiIpConfig.json

Lines changed: 967 additions & 510 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)