Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

testcase: Improve the effectiveness of test cases #4554

Merged
merged 1 commit into from
Feb 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions alicloud/connectivity/regions.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,5 @@ var MSCSupportRegions = []Region{Hangzhou}
var FCSupportRegions = []Region{Hangzhou}
var RDCupportRegions = []Region{Hangzhou}
var MSESupportRegions = []Region{Shenzhen, Beijing, EUWest1, APNorthEast1, Shanghai, ShanghaiFinance, APSouthEast5, USEast1, Zhangjiakou, CnNorth2Gov1, APSouthEast3, EUCentral1, Hangzhou, ShenZhenFinance, Qingdao, Hongkong, APSouthEast2, APSouth1, ChengDu, APSouthEast1, HeYuan, Huhehaote, USWest1}
var BrainIndustrialSupportRegions = []Region{Hangzhou}
var TestSalveRegions = []Region{Hangzhou}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package alicloud

import (
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
)

func TestAccAlicloudBrainIndustrialServiceDataSource(t *testing.T) {
checkoutSupportedRegions(t, true, connectivity.BrainIndustrialSupportRegions)
resourceId := "data.alicloud_brain_industrial_service.current"
testAccCheck := resourceAttrInit(resourceId, map[string]string{}).resourceAttrMapUpdateSet()
resource.Test(t, resource.TestCase{
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_cassandra_backup_plans_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
)

func TestAccAlicloudCassandraBackupPlansDataSource(t *testing.T) {
// Cassandra has been offline
t.Skip("Cassandra has been offline")
rand := acctest.RandInt()

var existAlicloudCassandraBackupPlanDataSourceNameMapFunc = func(rand int) map[string]string {
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_cassandra_clusters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ var checkCassandraInfo = dataSourceAttr{
}

func TestAccAlicloudCassandraClustersDataSourceNewCluster(t *testing.T) {
// Cassandra has been offline
t.Skip("Cassandra has been offline")
rand := acctest.RandInt()
nameRegexConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudCassandraDataSourceConfigNewCluster(rand, map[string]string{
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_cassandra_zones_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
)

func TestAccAlicloudCassandraZonesDataSource_basic(t *testing.T) {
// Cassandra has been offline
t.Skip("Cassandra has been offline")
rand := acctest.RandInt()
resourceId := "data.alicloud_cassandra_zones.default"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import (
)

func TestAccAlicloudCenTransitRouterRouteEntriesDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(0, 2999)
transitRouterRouteEntryIdsConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudCenTransitRouterRouteEntriesDataSourceName(rand, map[string]string{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import (
)

func TestAccAlicloudCenTransitRouterRouteTableAssociationsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
idsConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudCenTransitRouterRouteTableAssociationsDataSourceName(rand, map[string]string{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import (
)

func TestAccAlicloudCenTransitRouterRouteTablePropagationsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(0, 2999)
idsConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudCenTransitRouterRouteTablePropagationsDataSourceName(rand, map[string]string{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import (
)

func TestAccAlicloudCenTransitRouterVbrAttachmentsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
idsConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudCenTransitRouterVbrAttachmentsDataSourceName(rand, map[string]string{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"strings"
"testing"

"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudCenTransitRouterVpcAttachmentsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
idsConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudCenTransitRouterVpcAttachmentsDataSourceName(rand, map[string]string{
Expand Down
4 changes: 3 additions & 1 deletion alicloud/data_source_alicloud_cen_vbr_health_checks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import (

func TestAccAlicloudCenVbrHealthCheckDataSource(t *testing.T) {
rand := acctest.RandIntRange(0, 2999)

defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
cenIdConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudCenVbrHealthCheckSourceConfig(rand, map[string]string{
"cen_id": `"${alicloud_cen_instance.default.id}"`,
Expand Down
4 changes: 4 additions & 0 deletions alicloud/data_source_alicloud_dms_enterprise_users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudDmsEnterpriseUsersDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(1000000, 9999999)
resourceId := "data.alicloud_dms_enterprise_users.default"
name := fmt.Sprintf("tf_testAccDmsEnterpriseUsersDataSource_%d", rand)
Expand Down
3 changes: 3 additions & 0 deletions alicloud/data_source_alicloud_dts_consumer_channels_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudDtsConsumerChannelsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(1000, 9999)
checkoutSupportedRegions(t, true, connectivity.DTSSupportRegions)
idsConf := dataSourceTestAccConfig{
Expand Down
4 changes: 4 additions & 0 deletions alicloud/data_source_alicloud_dts_subscription_jobs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudDtsSubscriptionJobsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(1000000, 9999999)

subscriptionJobidconf := dataSourceTestAccConfig{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudDtsSynchronizationJobsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(1000000, 9999999)

synchronizationJobidconf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudDtsSynchronizationJobSourceConfig(rand, map[string]string{
"ids": `["${alicloud_dts_synchronization_job.default.id}"]`,
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_elasticsearch_instances_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
)

func TestAccAlicloudElasticsearchDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
rand := acctest.RandIntRange(1000000, 9999999)
resourceId := "data.alicloud_elasticsearch_instances.default"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
)

func TestAccAlicloudExpressConnectPhysicalConnectionServiceDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
resourceId := "data.alicloud_express_connect_physical_connection_service.current"
testAccCheck := resourceAttrInit(resourceId, map[string]string{}).resourceAttrMapUpdateSet()
resource.Test(t, resource.TestCase{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudExpressConnectPhysicalConnectionsDataSource(t *testing.T) {
checkoutAccount(t, true)
defer checkoutAccount(t, false)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
resourceId := "data.alicloud_express_connect_physical_connections.default"
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("tf-testAccExpressConnectPhysicalConnectionsTest%d", rand)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudExpressConnectVirtualBorderRoutersDataSource(t *testing.T) {
checkoutAccount(t, true)
defer checkoutAccount(t, false)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
resourceId := "data.alicloud_express_connect_virtual_border_routers.default"
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("tf-testAccExpressConnectVirtualBorderRoutersTest%d", rand)
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_hbr_backup_jobs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
)

func TestAccAlicloudHbrBackupJobsDataSource(t *testing.T) {
checkoutAccount(t, true)
defer checkoutAccount(t, false)
rand := acctest.RandIntRange(1000000, 9999999)
resourceId := "data.alicloud_hbr_backup_jobs.default"
name := fmt.Sprintf("tf-testAccHbrBackupJobTest%d", rand)
Expand Down
4 changes: 4 additions & 0 deletions alicloud/data_source_alicloud_hbr_ecs_backup_clients_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudHbrEcsBackupClientsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(1000000, 9999999)

ecsBackupIdsconf := dataSourceTestAccConfig{
Expand Down
3 changes: 3 additions & 0 deletions alicloud/data_source_alicloud_hbr_snapshots_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import (
)

func TestAccAlicloudHbrSnapshotsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(1000000, 9999999)

ecsBackupConf := dataSourceTestAccConfig{
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_msc_sub_contacts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudMscSubContactsDataSource(t *testing.T) {
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
idsConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudMscSubContactsDataSourceName(rand, map[string]string{
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_msc_sub_subscriptions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudMscSubSubscriptionsDataSource(t *testing.T) {
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
allConf := dataSourceTestAccConfig{
existConfig: testAccCheckAlicloudMscSubSubscriptionDataSourceConfig(rand, map[string]string{}),
Expand Down
1 change: 1 addition & 0 deletions alicloud/data_source_alicloud_sddp_configs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func testAccCheckAlicloudSddpConfigDataSourceName(rand int, attrMap map[string]s
config := fmt.Sprintf(`
resource "alicloud_sddp_config" "default" {
code = "access_failed_cnt"
description = "tf-testacc"
value = 50
}

Expand Down
2 changes: 1 addition & 1 deletion alicloud/data_source_alicloud_sddp_rules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func TestAccAlicloudSddpRuleDataSource(t *testing.T) {
"ids": `["${alicloud_sddp_rule.default.id}"]`,
}),
fakeConfig: testAccCheckAlicloudSddpRuleDataSourceName(rand, map[string]string{
"product_id": `"3"`,
"product_id": `"2"`,
"ids": `["${alicloud_sddp_rule.default.id}"]`,
}),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ package alicloud

import (
"fmt"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
)

func TestAccAlicloudSimpleApplicationServerDisksDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
resourceId := "data.alicloud_simple_application_server_disks.default"
rand := acctest.RandIntRange(100000, 999999)
name := fmt.Sprintf("tf-testacc-simpleapplicationserverdisk-%d", rand)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudSimpleApplicationServerFirewallRulesDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
resourceId := "data.alicloud_simple_application_server_firewall_rules.default"
rand := acctest.RandIntRange(1000000, 9999999)
checkoutSupportedRegions(t, true, connectivity.SWASSupportRegions)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import (
)

func TestAccAlicloudSimpleApplicationServerInstanceDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandIntRange(10000, 99999)

idsConf := dataSourceTestAccConfig{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudSimpleApplicationServerSnapshotsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
resourceId := "data.alicloud_simple_application_server_snapshots.default"
rand := acctest.RandIntRange(1000000, 9999999)
checkoutSupportedRegions(t, true, connectivity.SWASSupportRegions)
Expand Down
3 changes: 3 additions & 0 deletions alicloud/data_source_alicloud_vpc_bgp_groups_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudVpcBgpGroupsDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
checkoutSupportedRegions(t, true, connectivity.VPCBgpGroupSupportRegions)
idsConf := dataSourceTestAccConfig{
Expand Down
3 changes: 3 additions & 0 deletions alicloud/data_source_alicloud_vpc_bgp_networks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudVpcBgpNetworksDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
checkoutSupportedRegions(t, true, connectivity.VbrSupportRegions)
idsConf := dataSourceTestAccConfig{
Expand Down
3 changes: 3 additions & 0 deletions alicloud/data_source_alicloud_vpc_bgp_peers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import (
)

func TestAccAlicloudVpcBgpPeersDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
checkoutSupportedRegions(t, true, connectivity.TestSalveRegions)
rand := acctest.RandInt()
checkoutSupportedRegions(t, true, connectivity.VPCBgpGroupSupportRegions)
idsConf := dataSourceTestAccConfig{
Expand Down
2 changes: 2 additions & 0 deletions alicloud/data_source_alicloud_vs_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
)

func TestAccAlicloudVsServiceDataSource(t *testing.T) {
defer checkoutAccount(t, false)
checkoutAccount(t, true)
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
Expand Down