Skip to content

Commit

Permalink
SCALRCORE-19905 unit tests fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
vaniakov committed Sep 16, 2021
1 parent b1af9a8 commit 209e29d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 10 deletions.
34 changes: 24 additions & 10 deletions scalr/resource_scalr_agent_pool_token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log"
"os"
"testing"

"github.com/hashicorp/terraform/helper/resource"
Expand All @@ -13,8 +14,12 @@ import (

func TestAccScalrAgentPoolToken_basic(t *testing.T) {
token := &scalr.AgentPoolToken{}
pool := createPool(t)
defer deletePool(t, pool)

var pool scalr.AgentPool
if isAccTest() {
pool = createPool(t)
defer deletePool(t, pool)
}

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -35,8 +40,11 @@ func TestAccScalrAgentPoolToken_basic(t *testing.T) {

func TestAccScalrAgentPoolToken_changed_outside(t *testing.T) {

pool := createPool(t)
defer deletePool(t, pool)
var pool scalr.AgentPool
if isAccTest() {
pool = createPool(t)
defer deletePool(t, pool)
}
token := &scalr.AgentPoolToken{}

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -66,8 +74,11 @@ func TestAccScalrAgentPoolToken_changed_outside(t *testing.T) {
})
}
func TestAccScalrAgentPoolToken_update(t *testing.T) {
pool := createPool(t)
defer deletePool(t, pool)
var pool scalr.AgentPool
if isAccTest() {
pool = createPool(t)
defer deletePool(t, pool)
}
token := &scalr.AgentPoolToken{}

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -145,10 +156,15 @@ func testAccCheckScalrAgentPoolTokenChangedOutside(pool scalr.AgentPool, token *
}
}

func deletePool(t *testing.T, pool scalr.AgentPool) {
func createScalrClient() (*scalr.Client, error) {
config := scalr.DefaultConfig()
config.Address = fmt.Sprintf("https://%s", os.Getenv("SCALR_HOSTNAME"))
scalrClient, err := scalr.NewClient(config)
return scalrClient, err
}

func deletePool(t *testing.T, pool scalr.AgentPool) {
scalrClient, err := createScalrClient()
if err != nil {
t.Fatalf("Unable to create a Scalr client: %s", err)
}
Expand All @@ -162,9 +178,7 @@ func deletePool(t *testing.T, pool scalr.AgentPool) {
func createPool(t *testing.T) scalr.AgentPool {
name := fmt.Sprintf("provider-test-pool-%d", GetRandomInteger())

config := scalr.DefaultConfig()
scalrClient, err := scalr.NewClient(config)

scalrClient, err := createScalrClient()
if err != nil {
t.Fatalf("Unable to create a Scalr client: %s", err)
}
Expand Down
6 changes: 6 additions & 0 deletions scalr/testing.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package scalr

import (
"os"
"reflect"
"testing"

Expand Down Expand Up @@ -38,3 +39,8 @@ func assertCorrectState(t *testing.T, err error, actual, expected map[string]int
t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", expected, actual)
}
}

// isAccTest returns true if executed while running acceptance tests
func isAccTest() bool {
return os.Getenv("TF_ACC") == "1"
}

0 comments on commit 209e29d

Please sign in to comment.