IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

heroku: randomize the remaining appnames in tests

Browse Source 
Should take care of the remaining flapping acceptance test failures like
this:

https://travis-ci.org/hashicorp/terraform/builds/104012729
This commit is contained in:
Paul Hinze 2016-01-22 09:26:34 -06:00
parent b269b80803
commit 19d90ae00f
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/providers/heroku/resource_heroku_domain_test.go
View File

@ -5,12 +5,14 @@ import (
"testing" "testing"
"github.com/cyberdelia/heroku-go/v3" "github.com/cyberdelia/heroku-go/v3"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccHerokuDomain_Basic(t *testing.T) { func TestAccHerokuDomain_Basic(t *testing.T) {
var domain heroku.Domain var domain heroku.Domain
appName := fmt.Sprintf("tftest-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -18,16 +20,17 @@ func TestAccHerokuDomain_Basic(t *testing.T) {
CheckDestroy: testAccCheckHerokuDomainDestroy, CheckDestroy: testAccCheckHerokuDomainDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccCheckHerokuDomainConfig_basic, Config: testAccCheckHerokuDomainConfig_basic(appName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckHerokuDomainExists("heroku_domain.foobar", &domain), testAccCheckHerokuDomainExists("heroku_domain.foobar", &domain),
testAccCheckHerokuDomainAttributes(&domain), testAccCheckHerokuDomainAttributes(&domain),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"heroku_domain.foobar", "hostname", "terraform.example.com"), "heroku_domain.foobar", "hostname", "terraform.example.com"),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"heroku_domain.foobar", "app", "terraform-test-app"), "heroku_domain.foobar", "app", appName),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"heroku_domain.foobar", "cname", "terraform-test-app.herokuapp.com"), "heroku_domain.foobar", "cname",
fmt.Sprintf("%s.herokuapp.com", appName)),
), ),
}, },
}, },
@ -93,13 +96,14 @@ func testAccCheckHerokuDomainExists(n string, Domain *heroku.Domain) resource.Te
} }
} }
const testAccCheckHerokuDomainConfig_basic = ` func testAccCheckHerokuDomainConfig_basic(appName string) string {
resource "heroku_app" "foobar" { return fmt.Sprintf(`resource "heroku_app" "foobar" {
name = "terraform-test-app" name = "%s"
region = "us" region = "us"
} }
resource "heroku_domain" "foobar" { resource "heroku_domain" "foobar" {
app = "${heroku_app.foobar.name}" app = "${heroku_app.foobar.name}"
hostname = "terraform.example.com" hostname = "terraform.example.com"
}` }`, appName)
}

14
builtin/providers/heroku/resource_heroku_drain_test.go
View File

@ -5,12 +5,14 @@ import (
"testing" "testing"
"github.com/cyberdelia/heroku-go/v3" "github.com/cyberdelia/heroku-go/v3"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccHerokuDrain_Basic(t *testing.T) { func TestAccHerokuDrain_Basic(t *testing.T) {
var drain heroku.LogDrain var drain heroku.LogDrain
appName := fmt.Sprintf("tftest-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -18,14 +20,14 @@ func TestAccHerokuDrain_Basic(t *testing.T) {
CheckDestroy: testAccCheckHerokuDrainDestroy, CheckDestroy: testAccCheckHerokuDrainDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccCheckHerokuDrainConfig_basic, Config: testAccCheckHerokuDrainConfig_basic(appName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckHerokuDrainExists("heroku_drain.foobar", &drain), testAccCheckHerokuDrainExists("heroku_drain.foobar", &drain),
testAccCheckHerokuDrainAttributes(&drain), testAccCheckHerokuDrainAttributes(&drain),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"heroku_drain.foobar", "url", "syslog://terraform.example.com:1234"), "heroku_drain.foobar", "url", "syslog://terraform.example.com:1234"),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"heroku_drain.foobar", "app", "terraform-test-app"), "heroku_drain.foobar", "app", appName),
), ),
}, },
}, },
@ -95,13 +97,15 @@ func testAccCheckHerokuDrainExists(n string, Drain *heroku.LogDrain) resource.Te
} }
} }
const testAccCheckHerokuDrainConfig_basic = ` func testAccCheckHerokuDrainConfig_basic(appName string) string {
return fmt.Sprintf(`
resource "heroku_app" "foobar" { resource "heroku_app" "foobar" {
name = "terraform-test-app" name = "%s"
region = "us" region = "us"
} }
resource "heroku_drain" "foobar" { resource "heroku_drain" "foobar" {
app = "${heroku_app.foobar.name}" app = "${heroku_app.foobar.name}"
url = "syslog://terraform.example.com:1234" url = "syslog://terraform.example.com:1234"
}` }`, appName)
}