Skip to content

Commit 347fb9a

Browse files
authored
Refactor resourcemanager tests to work with latest TestProxy (additional) (#41388)
Refactor resourcemanager tests to work with latest TestProxy (additional)
1 parent eed41c1 commit 347fb9a

File tree

5 files changed

+39
-35
lines changed

5 files changed

+39
-35
lines changed

sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeSkuTests.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55

66
import com.azure.core.http.HttpPipeline;
77
import com.azure.core.http.rest.PagedIterable;
8+
import com.azure.core.management.Region;
9+
import com.azure.core.management.profile.AzureProfile;
810
import com.azure.core.test.annotation.DoNotRecord;
9-
import com.azure.core.test.annotation.LiveOnly;
1011
import com.azure.resourcemanager.compute.models.ComputeResourceType;
1112
import com.azure.resourcemanager.compute.models.ComputeSku;
12-
import com.azure.resourcemanager.test.utils.TestUtilities;
1313
import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId;
14-
import com.azure.core.management.Region;
15-
import java.util.Map;
16-
import java.util.Set;
17-
18-
import com.azure.core.management.profile.AzureProfile;
14+
import com.azure.resourcemanager.test.utils.TestUtilities;
1915
import org.junit.jupiter.api.Assertions;
2016
import org.junit.jupiter.api.Test;
2117

18+
import java.util.Map;
19+
import java.util.Set;
20+
2221
public class ComputeSkuTests extends ComputeManagementTest {
2322
@Override
2423
protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile) {
@@ -99,7 +98,7 @@ public void canListSkus() throws Exception {
9998
}
10099

101100
@Test
102-
@LiveOnly
101+
@DoNotRecord(skipInPlayback = true)
103102
public void canListSkusByRegion() throws Exception {
104103
// LiveOnly because "test timing out after latest test proxy update"
105104
PagedIterable<ComputeSku> skus = this.computeManager.computeSkus().listByRegion(Region.US_EAST2);
@@ -125,7 +124,7 @@ public void canListSkusByResourceType() throws Exception {
125124
}
126125

127126
@Test
128-
@LiveOnly
127+
@DoNotRecord(skipInPlayback = true)
129128
public void canListSkusByRegionAndResourceType() throws Exception {
130129
// LiveOnly because "test timing out after latest test proxy update"
131130
PagedIterable<ComputeSku> skus =

sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineManagedServiceIdentityOperationsTests.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
import com.azure.core.http.HttpPipeline;
77
import com.azure.core.http.rest.PagedIterable;
8+
import com.azure.core.management.Region;
89
import com.azure.core.management.profile.AzureProfile;
9-
import com.azure.core.test.annotation.LiveOnly;
10+
import com.azure.core.test.annotation.DoNotRecord;
1011
import com.azure.resourcemanager.authorization.models.BuiltInRole;
1112
import com.azure.resourcemanager.authorization.models.RoleAssignment;
1213
import com.azure.resourcemanager.compute.models.CachingTypes;
1314
import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage;
1415
import com.azure.resourcemanager.compute.models.ResourceIdentityType;
1516
import com.azure.resourcemanager.compute.models.VirtualMachine;
1617
import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes;
17-
import com.azure.core.management.Region;
1818
import com.azure.resourcemanager.resources.models.ResourceGroup;
1919
import com.azure.resourcemanager.storage.models.StorageAccount;
2020
import org.junit.jupiter.api.Assertions;
@@ -37,9 +37,10 @@ protected void cleanUpResources() {
3737
}
3838

3939
@Test
40-
@LiveOnly
40+
@DoNotRecord(skipInPlayback = true)
4141
public void canSetMSIOnNewOrExistingVMWithoutRoleAssignment() throws Exception {
4242
// LiveOnly because test needs to be refactored for storing/evaluating PrincipalId
43+
// and "test timing out after latest test proxy update"
4344
// Create a virtual machine with just MSI enabled without role and scope.
4445
//
4546
VirtualMachine virtualMachine =
@@ -247,9 +248,10 @@ public void canSetMSIOnNewVMWithMultipleRoleAssignments() throws Exception {
247248
}
248249

249250
@Test
250-
@LiveOnly
251+
@DoNotRecord(skipInPlayback = true)
251252
public void canSetMSIOnExistingVMWithRoleAssignments() throws Exception {
252253
// LiveOnly because test needs to be refactored for storing/evaluating PrincipalId
254+
// and "test timing out after latest test proxy update"
253255
VirtualMachine virtualMachine =
254256
computeManager
255257
.virtualMachines()

sdk/resourcemanager/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import com.azure.core.http.policy.HttpPipelinePolicy;
1111
import com.azure.core.http.policy.RetryPolicy;
1212
import com.azure.core.http.rest.PagedIterable;
13+
import com.azure.core.management.Region;
1314
import com.azure.core.management.profile.AzureProfile;
14-
import com.azure.core.test.annotation.LiveOnly;
15+
import com.azure.core.test.annotation.DoNotRecord;
1516
import com.azure.resourcemanager.authorization.models.BuiltInRole;
1617
import com.azure.resourcemanager.authorization.models.RoleAssignment;
1718
import com.azure.resourcemanager.msi.models.Identity;
1819
import com.azure.resourcemanager.resources.ResourceManager;
19-
import com.azure.core.management.Region;
2020
import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
2121
import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
2222
import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
@@ -126,8 +126,10 @@ public void canCreateGetListDeleteIdentity() throws Exception {
126126
}
127127

128128
@Test
129-
@LiveOnly
129+
@DoNotRecord(skipInPlayback = true)
130130
public void canAssignCurrentResourceGroupAccessRoleToIdentity() throws Exception {
131+
// In `PLAYBACK` mode, An identity update exception occurred.
132+
// Flux#last() didn't observe any onNext signal
131133
rgName = generateRandomResourceName("javaismrg", 15);
132134
String identityName = generateRandomResourceName("msi-id", 15);
133135

sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/PolicyTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
package com.azure.resourcemanager.resources;
55

66
import com.azure.core.http.rest.PagedIterable;
7+
import com.azure.core.management.Region;
78
import com.azure.core.test.annotation.DoNotRecord;
8-
import com.azure.core.test.annotation.LiveOnly;
99
import com.azure.resourcemanager.resources.models.EnforcementMode;
10+
import com.azure.resourcemanager.resources.models.GenericResource;
1011
import com.azure.resourcemanager.resources.models.ParameterDefinitionsValue;
1112
import com.azure.resourcemanager.resources.models.ParameterType;
12-
import com.azure.resourcemanager.test.utils.TestUtilities;
13-
import com.azure.resourcemanager.resources.models.GenericResource;
1413
import com.azure.resourcemanager.resources.models.PolicyAssignment;
1514
import com.azure.resourcemanager.resources.models.PolicyDefinition;
1615
import com.azure.resourcemanager.resources.models.PolicyType;
1716
import com.azure.resourcemanager.resources.models.ResourceGroup;
17+
import com.azure.resourcemanager.test.utils.TestUtilities;
1818
import com.fasterxml.jackson.databind.ObjectMapper;
19-
import com.azure.core.management.Region;
2019
import org.junit.jupiter.api.Assertions;
2120
import org.junit.jupiter.api.Test;
2221

@@ -35,8 +34,9 @@ protected void cleanUpResources() {
3534

3635
@SuppressWarnings("unchecked")
3736
@Test
38-
@LiveOnly
37+
@DoNotRecord(skipInPlayback = true)
3938
public void canCRUDPolicyDefinition() throws Exception {
39+
// LiveOnly because "test timing out after latest test proxy update"
4040
String policyName = generateRandomResourceName("policy", 15);
4141
String displayName = generateRandomResourceName("mypolicy", 15);
4242
try {

sdk/resourcemanager/azure-resourcemanager-sql/src/test/java/com/azure/resourcemanager/sql/SqlServerOperationsTests.java

+15-14
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.azure.core.management.Region;
88
import com.azure.core.management.exception.ManagementException;
99
import com.azure.core.test.annotation.DoNotRecord;
10-
import com.azure.core.test.annotation.LiveOnly;
1110
import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
1211
import com.azure.resourcemanager.resources.fluentcore.model.Indexable;
1312
import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
@@ -30,9 +29,9 @@
3029
import com.azure.resourcemanager.sql.models.RegionCapabilities;
3130
import com.azure.resourcemanager.sql.models.ReplicationLink;
3231
import com.azure.resourcemanager.sql.models.SampleName;
33-
import com.azure.resourcemanager.sql.models.ServerNetworkAccessFlag;
3432
import com.azure.resourcemanager.sql.models.SecurityAlertPolicyName;
3533
import com.azure.resourcemanager.sql.models.SecurityAlertPolicyState;
34+
import com.azure.resourcemanager.sql.models.ServerNetworkAccessFlag;
3635
import com.azure.resourcemanager.sql.models.ServiceObjectiveName;
3736
import com.azure.resourcemanager.sql.models.Sku;
3837
import com.azure.resourcemanager.sql.models.SqlActiveDirectoryAdministrator;
@@ -71,6 +70,7 @@
7170
import java.nio.file.Files;
7271
import java.time.Duration;
7372
import java.util.ArrayList;
73+
import java.util.Arrays;
7474
import java.util.Collections;
7575
import java.util.LinkedList;
7676
import java.util.List;
@@ -584,7 +584,7 @@ public void canCreateAndAquireServerDnsAlias() throws Exception {
584584
}
585585

586586
@Test
587-
@LiveOnly
587+
@DoNotRecord(skipInPlayback = true)
588588
public void canGetSqlServerCapabilitiesAndCreateIdentity() throws Exception {
589589
// LiveOnly because "test timing out after latest test proxy update"
590590
String sqlServerAdminName = "sqladmin";
@@ -1654,10 +1654,11 @@ private void validateSqlDatabaseWithElasticPool(SqlDatabase sqlDatabase, String
16541654
}
16551655

16561656
@Test
1657-
@LiveOnly
1657+
@DoNotRecord(skipInPlayback = true)
16581658
public void testRandomSku() {
16591659
// LiveOnly because "test timing out after latest test proxy update"
16601660
// "M" series is not supported in this region
1661+
List<CapabilityStatus> capabilityStatusList = Arrays.asList(CapabilityStatus.AVAILABLE, CapabilityStatus.DEFAULT);
16611662
List<DatabaseSku> databaseSkus = DatabaseSku.getAll().stream().filter(sku -> !"M".equals(sku.toSku().family())).collect(Collectors.toCollection(LinkedList::new));
16621663
Collections.shuffle(databaseSkus);
16631664
List<ElasticPoolSku> elasticPoolSkus = ElasticPoolSku.getAll().stream().filter(sku -> !"M".equals(sku.toSku().family())).collect(Collectors.toCollection(LinkedList::new));
@@ -1666,18 +1667,18 @@ public void testRandomSku() {
16661667
sqlServerManager.sqlServers().getCapabilitiesByRegion(Region.US_EAST).supportedCapabilitiesByServerVersion()
16671668
.forEach((x, serverVersionCapability) -> {
16681669
serverVersionCapability.supportedEditions().forEach(edition -> {
1669-
edition.supportedServiceLevelObjectives().forEach(serviceObjective -> {
1670-
if (serviceObjective.status() != CapabilityStatus.AVAILABLE && serviceObjective.status() != CapabilityStatus.DEFAULT || "M".equals(serviceObjective.sku().family())) {
1671-
databaseSkus.remove(DatabaseSku.fromSku(serviceObjective.sku()));
1672-
}
1673-
});
1670+
edition.supportedServiceLevelObjectives()
1671+
.stream().filter(serviceObjective ->
1672+
!capabilityStatusList.contains(serviceObjective.status())
1673+
|| "M".equals(serviceObjective.sku().family()))
1674+
.forEach(serviceObjective -> databaseSkus.remove(DatabaseSku.fromSku(serviceObjective.sku())));
16741675
});
16751676
serverVersionCapability.supportedElasticPoolEditions().forEach(edition -> {
1676-
edition.supportedElasticPoolPerformanceLevels().forEach(performance -> {
1677-
if (performance.status() != CapabilityStatus.AVAILABLE && performance.status() != CapabilityStatus.DEFAULT || "M".equals(performance.sku().family())) {
1678-
elasticPoolSkus.remove(ElasticPoolSku.fromSku(performance.sku()));
1679-
}
1680-
});
1677+
edition.supportedElasticPoolPerformanceLevels()
1678+
.stream().filter(performance ->
1679+
!capabilityStatusList.contains(performance.status())
1680+
|| "M".equals(performance.sku().family()))
1681+
.forEach(performance -> elasticPoolSkus.remove(ElasticPoolSku.fromSku(performance.sku())));
16811682
});
16821683
});
16831684

0 commit comments

Comments
 (0)