test: fix some broken tests (#533)

scaleway · Aug 28, 2020 · 2fe2901 · 2fe2901
1 parent 7caf1a9
commit 2fe2901
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ install:
 script:
 - make test
 - make vet
-- make website-test
 
 branches:
   only:

diff --git a/scaleway/data_source_marketplace_image_beta_test.go b/scaleway/data_source_marketplace_image_beta_test.go
@@ -19,7 +19,7 @@ data "scaleway_marketplace_image_beta" "test1" {
 `,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstanceImageExists("data.scaleway_marketplace_image_beta.test1"),
-					resource.TestCheckResourceAttr("data.scaleway_marketplace_image_beta.test1", "id", "fr-par-1/365a8b9c-0c6e-4875-a887-dc3213db9e20"),
+					resource.TestCheckResourceAttr("data.scaleway_marketplace_image_beta.test1", "id", "fr-par-1/cf44b8f5-77e2-42ed-8f1e-09ed5bb028fc"),
 				),
 			},
 		},

diff --git a/scaleway/resource_instance_server_test.go b/scaleway/resource_instance_server_test.go
@@ -615,7 +615,7 @@ func TestAccScalewayInstanceServerImageDataSource(t *testing.T) {
 			{
 				Config: `
 					data "scaleway_instance_image" "ubuntu_focal" {
-					  name = "ubuntu_focal"
+					  name = "Ubuntu 20.04 Focal Fossa"
 					}
 
 					resource "scaleway_instance_server" "base" {
@@ -625,14 +625,14 @@ func TestAccScalewayInstanceServerImageDataSource(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstanceServerExists("scaleway_instance_server.base"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "image", "fr-par-1/6651f88f-45af-4b93-95e8-3931b74f6acc"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.base", "image", "fr-par-1/4e84fc90-baef-43c2-ba9c-caa135de7afd"),
 				),
 			},
 			// Ensure that image diffSuppressFunc results in no plan.
 			{
 				Config: `
 					data "scaleway_instance_image" "ubuntu_focal" {
-					  name = "ubuntu_focal"
+					  name = "Ubuntu 20.04 Focal Fossa"
 					}
 
 					resource "scaleway_instance_server" "base" {
@@ -778,7 +778,7 @@ EOF`
 	return fmt.Sprintf(`
 data "scaleway_image" "ubuntu" {
   architecture = "x86_64"
-  name         = "Ubuntu Focal"
+  name         = "Ubuntu 20.04 Focal Fossa"
   most_recent  = true
 }
 

diff --git a/scaleway/resource_k8s_cluster_beta_test.go b/scaleway/resource_k8s_cluster_beta_test.go
@@ -428,7 +428,7 @@ func testAccCheckScalewayK8SClusterBetaDeprecated(version string, size int) stri
 resource "scaleway_k8s_cluster_beta" "deprecated" {
 	cni = "calico"
 	version = "%s"
-	name = "deprecated"
+	name = "ClusterBetaDeprecated"
 	tags = [ "terraform-test", "scaleway_k8s_cluster_beta", "deprecated" ]
 	default_pool {
 	  node_type = "DEV1-M"
@@ -442,7 +442,7 @@ func testAccCheckScalewayK8SClusterBetaConfigMinimal(version string) string {
 resource "scaleway_k8s_cluster_beta" "minimal" {
 	cni = "calico"
 	version = "%s"
-	name = "minimal"
+	name = "ClusterBetaConfigMinimal"
 	tags = [ "terraform-test", "scaleway_k8s_cluster_beta", "minimal" ]
 }`, version)
 }

diff --git a/scaleway/resource_k8s_pool_beta_test.go b/scaleway/resource_k8s_pool_beta_test.go
@@ -228,7 +228,7 @@ resource "scaleway_k8s_pool_beta" "default" {
 	tags = [ "terraform-test", "scaleway_k8s_cluster_beta", "default" ]
 }
 resource "scaleway_k8s_cluster_beta" "minimal" {
-    name = "minimal"
+    name = "K8SPoolBetaConfigMinimal"
 	cni = "calico"
 	version = "%s"
 	tags = [ "terraform-test", "scaleway_k8s_cluster_beta", "minimal" ]
@@ -264,7 +264,7 @@ resource "scaleway_k8s_pool_beta" "default" {
 }
 
 resource "scaleway_k8s_cluster_beta" "minimal" {
-    name = "minimal"
+    name = "PoolBetaConfigWait"
 	cni = "calico"
 	version = "%s"
 	tags = [ "terraform-test", "scaleway_k8s_cluster_beta", "minimal" ]