Skip to content

Commit b922ec3

Browse files
Updated setupNodeBalancerNode to use one client
1 parent 5afdc9b commit b922ec3

8 files changed

+4114
-1254
lines changed

test/integration/fixtures/TestInstance_NodeBalancers_List.yaml

Lines changed: 468 additions & 13 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestNodeBalancerNode_Create.yaml

Lines changed: 510 additions & 221 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestNodeBalancerNode_Get.yaml

Lines changed: 611 additions & 202 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestNodeBalancerNode_Update.yaml

Lines changed: 613 additions & 204 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestNodeBalancerNodes_List.yaml

Lines changed: 613 additions & 205 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestNodeBalancerNodes_ListMultiplePages.yaml

Lines changed: 611 additions & 202 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestNodeBalancer_Rebuild.yaml

Lines changed: 680 additions & 204 deletions
Large diffs are not rendered by default.

test/integration/nodebalancer_config_nodes_test.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ func setupNodeBalancerNode(t *testing.T, fixturesYaml string) (*linodego.Client,
165165
t.Fatalf("Error creating nodebalancer config, got error %v", err)
166166
}
167167

168-
client, instance, instanceTeardown, err := setupInstance(t, fixturesYaml+"Instance", true)
168+
instance, err := createInstance(t, client, true)
169169
if err != nil {
170-
t.Fatal(err)
170+
t.Errorf("failed to create test instance: %s", err)
171171
}
172172

173173
instanceIP, err := client.AddInstanceIPAddress(context.Background(), instance.ID, false)
@@ -191,8 +191,13 @@ func setupNodeBalancerNode(t *testing.T, fixturesYaml string) (*linodego.Client,
191191
t.Fatalf("Expected to delete a NodeBalancer Config Node, but got %v", err)
192192
}
193193
}
194+
// delete the instance
195+
if err := client.DeleteInstance(context.Background(), instance.ID); err != nil {
196+
if t != nil {
197+
t.Errorf("Error deleting test Instance: %s", err)
198+
}
199+
}
194200
fixtureTeardown()
195-
instanceTeardown()
196201
}
197202
return client, nodebalancer, config, node, teardown, err
198203
}

0 commit comments

Comments
 (0)