fix tests

Author: Laure-di

internal/services/baremetal/helpers.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	ServerTimeout          = 60 * time.Minute
+	ServerTimeout          = 80 * time.Minute
 	serverRetryFuncTimeout = ServerTimeout + time.Minute // some RetryFunc are calling a WaitFor
 	defaultServerTimeout   = serverRetryFuncTimeout + time.Minute
 	retryInterval          = 5 * time.Second

internal/services/baremetal/offer_data_source_test.go

@@ -14,15 +14,15 @@ import (
 )
 
 const (
-	offerName = "EM-B220E-NVME"
-	region    = "fr-par-1"
-	offerId   = "206ea234-9097-4ae1-af68-6d2be09f47ed"
+	OfferName = "EM-B220E-NVME"
+	Region    = "fr-par-1"
+	OfferId   = "206ea234-9097-4ae1-af68-6d2be09f47ed"
 )
 
 func TestAccDataSourceOffer_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(offerId, region, tt) {
+	if !IsOfferAvailable(OfferId, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 	resource.ParallelTest(t, resource.TestCase{
@@ -39,13 +39,13 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
 					data "scaleway_baremetal_offer" "test2" {
 						offer_id = data.scaleway_baremetal_offer.test1.offer_id
 					}
-				`, offerName),
+				`, OfferName),
 				Check: resource.ComposeTestCheckFunc(
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", offerName),
+					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test2"),
 					resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", offerName),
+					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", OfferName),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"), //what the hell
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
@@ -72,7 +72,7 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
 func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(offerId, region, tt) {
+	if !IsOfferAvailable(OfferId, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 	resource.ParallelTest(t, resource.TestCase{
@@ -91,14 +91,14 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 					data "scaleway_baremetal_offer" "test2" {
 						offer_id = data.scaleway_baremetal_offer.test1.offer_id
 					}
-				`, offerName),
+				`, OfferName),
 				Check: resource.ComposeTestCheckFunc(
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", offerName),
+					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "subscription_period", "hourly"),
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test2"),
 					resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", offerName),
+					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", OfferName),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "subscription_period", "hourly"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
@@ -126,7 +126,7 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(offerId, region, tt) {
+	if !IsOfferAvailable(OfferId, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 	resource.ParallelTest(t, resource.TestCase{
@@ -145,14 +145,14 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
 					data "scaleway_baremetal_offer" "test2" {
 						offer_id = data.scaleway_baremetal_offer.test1.offer_id
 					}
-				`, offerName),
+				`, OfferName),
 				Check: resource.ComposeTestCheckFunc(
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", offerName),
+					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "subscription_period", "monthly"),
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test2"),
 					resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", offerName),
+					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", OfferName),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "subscription_period", "monthly"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),

internal/services/baremetal/server_data_source_test.go

@@ -12,6 +12,9 @@ import (
 func TestAccDataSourceServer_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
+	if !IsOfferAvailable(OfferId, Region, tt) {
+		t.Skip("Offer is out of stock")
+	}
 
 	SSHKeyName := "TestAccScalewayDataSourceBaremetalServer_Basic"
 	name := "TestAccScalewayDataSourceBaremetalServer_Basic"
@@ -31,7 +34,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 
 					data "scaleway_baremetal_offer" "my_offer" {
 						zone = "fr-par-1"
-						name = "EM-A115X-SSD"
+						name = "%s"
 					}
 
 					resource "scaleway_iam_ssh_key" "main" {
@@ -48,7 +51,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 					
 						ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
 					}
-				`, SSHKeyName, SSHKeyBaremetal, name),
+				`, OfferName, SSHKeyName, SSHKeyBaremetal, name),
 			},
 			{
 				Config: fmt.Sprintf(`
@@ -60,7 +63,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 
 					data "scaleway_baremetal_offer" "my_offer" {
 						zone = "fr-par-1"
-						name = "EM-A115X-SSD"
+						name = "%s"
 					}
 
 					resource "scaleway_iam_ssh_key" "main" {
@@ -87,7 +90,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 						server_id = "${scaleway_baremetal_server.main.id}"
 						zone = "fr-par-1"
 					}
-				`, SSHKeyName, SSHKeyBaremetal, name),
+				`, OfferName, SSHKeyName, SSHKeyBaremetal, name),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckBaremetalServerExists(tt, "data.scaleway_baremetal_server.by_id"),
 					testAccCheckBaremetalServerExists(tt, "data.scaleway_baremetal_server.by_name"),