ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update provider test and extend the delete timelimit

This commit is contained in:
clint shryock 2016-02-04 15:48:54 -06:00
parent 840d2e7ccc
commit 52f3e9b8db
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/aws/resource_aws_elasticache_cluster.go
View File

@ -539,7 +539,7 @@ func resourceAwsElasticacheClusterDelete(d *schema.ResourceData, meta interface{
Pending: []string{"creating", "available", "deleting", "incompatible-parameters", "incompatible-network", "restore-failed"},
Target: []string{},
Refresh: cacheClusterStateRefreshFunc(conn, d.Id(), "", []string{}),
Timeout: 10 * time.Minute,
Timeout: 20 * time.Minute,
Delay: 10 * time.Second,
MinTimeout: 3 * time.Second,
}

16
builtin/providers/aws/resource_aws_elasticache_cluster_test.go
View File

@ -37,8 +37,8 @@ func TestAccAWSElasticacheCluster_snapshotsWithUpdates(t *testing.T) {
var ec elasticache.CacheCluster
ri := acctest.RandInt()
preConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfig_snapshots, ri, ri, ri)
postConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfig_snapshotsUpdated, ri, ri, ri)
preConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfig_snapshots, ri, ri, acctest.RandString(10))
postConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfig_snapshotsUpdated, ri, ri, acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
@ -76,8 +76,8 @@ func TestAccAWSElasticacheCluster_decreasingCacheNodes(t *testing.T) {
var ec elasticache.CacheCluster
ri := acctest.RandInt()
preConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfigDecreasingNodes, ri, ri, ri)
postConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfigDecreasingNodes_update, ri, ri, ri)
preConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfigDecreasingNodes, ri, ri, acctest.RandString(10))
postConfig := fmt.Sprintf(testAccAWSElasticacheClusterConfigDecreasingNodes_update, ri, ri, acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
@ -271,7 +271,7 @@ resource "aws_elasticache_security_group" "bar" {
}
resource "aws_elasticache_cluster" "bar" {
cluster_id = "tf-%03d"
cluster_id = "tf-%s"
engine = "redis"
node_type = "cache.m1.small"
num_cache_nodes = 1
@ -305,7 +305,7 @@ resource "aws_elasticache_security_group" "bar" {
}
resource "aws_elasticache_cluster" "bar" {
cluster_id = "tf-%03d"
cluster_id = "tf-%s"
engine = "redis"
node_type = "cache.m1.small"
num_cache_nodes = 1
@ -340,7 +340,7 @@ resource "aws_elasticache_security_group" "bar" {
}
resource "aws_elasticache_cluster" "bar" {
cluster_id = "tf-%03d"
cluster_id = "tf-%s"
engine = "memcached"
node_type = "cache.m1.small"
num_cache_nodes = 3
@ -372,7 +372,7 @@ resource "aws_elasticache_security_group" "bar" {
}
resource "aws_elasticache_cluster" "bar" {
cluster_id = "tf-%03d"
cluster_id = "tf-%s"
engine = "memcached"
node_type = "cache.m1.small"
num_cache_nodes = 1