Fix and improve VPC test (#412)

linode · Oct 24, 2023 · a362978 · a362978
1 parent 0a02d1f
commit a362978
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/test/integration/vpc_subnet_test.go b/test/integration/vpc_subnet_test.go
@@ -107,23 +107,6 @@ func createVPCWithSubnet(t *testing.T, client *linodego.Client) (
 	return vpc, vpcSubnet, teardown, err
 }
 
-func createVPCWithSubnetInvalidLabel(t *testing.T, client *linodego.Client) error {
-	t.Helper()
-	vpc, vpcTeardown, err := createVPC(t, client)
-	if err != nil {
-		if vpcTeardown != nil {
-			vpcTeardown()
-		}
-		t.Fatal(err)
-	}
-	createOpts := linodego.VPCSubnetCreateOptions{
-		Label: "linodego-vpc-test_invalid_label" + getUniqueText(),
-		IPv4:  TestSubnet,
-	}
-	_, err = client.CreateVPCSubnet(context.Background(), createOpts, vpc.ID)
-
-	return err
-}
 
 func setupVPCWithSubnet(
 	t *testing.T,
@@ -213,10 +196,17 @@ func TestVPC_Subnet_List(t *testing.T) {
 }
 
 func TestVPC_Subnet_Create_Invalid_data(t *testing.T) {
-	client, _ := createTestClient(t, "fixtures/TestVPC_Subnet_Create_Invalid_Label")
-
-	err := createVPCWithSubnetInvalidLabel(t, client)
+	client, vpc, teardown, err := setupVPC(t, "fixtures/TestVPC_Subnet_Create_Invalid_data")
+	defer teardown()
+	if err != nil {
+		t.Error(formatVPCSubnetError(err, "setting up", nil, nil))
+	}
 
+	createOpts := linodego.VPCSubnetCreateOptions{
+		Label: "linodego-vpc-test_invalid_label" + getUniqueText(),
+		IPv4:  TestSubnet,
+	}
+	_, err = client.CreateVPCSubnet(context.Background(), createOpts, vpc.ID)
 	e, _ := err.(*Error)
 
 	if e.Code != 400 {

diff --git a/test/integration/vpc_test.go b/test/integration/vpc_test.go
@@ -117,15 +117,17 @@ func vpcUpdateOptionsCheck(
 	}
 }
 
-func TestVPC_Create(t *testing.T) {
-	_, vpc, teardown, err := setupVPC(t, "fixtures/TestVPC_Create")
+
+func TestVPC_CreateGet(t *testing.T) {
+	client, vpc, teardown, err := setupVPC(t, "fixtures/TestVPC_CreateGet")
 	defer teardown()
 	if err != nil {
 		t.Error(formatVPCError(err, "setting up", nil))
 	}
 	vpcCheck(vpc, t)
 	opts := vpc.GetCreateOptions()
 	vpcCreateOptionsCheck(&opts, vpc, t)
+	client.GetVPC(context.TODO(), vpc.ID)
 }
 
 func TestVPC_Update(t *testing.T) {