Skip to content

Commit 4e91d5c

Browse files
stephenfinstephenfin
committed
tests: Fix lint issues
We have a number of tests that we do not appear to be running in CI. In addition, we are not running go vet with all suitable build tags resulting in some tests being skipped [1]. Combined, this has resulted in a number of tests that have not been fully updated to use context. While we will address the root cause elsewhere, we can fix the missed updates here. You can validate this fix by overriding GOFLAGS, as outlined in [1]. For example, from the root directory: GOFLAGS="-tags=acceptance" go vet ./... [1] golang/go#29202 Signed-off-by: Stephen Finucane <[email protected]>
1 parent 0acf4d6 commit 4e91d5c

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

‎internal/acceptance/openstack/container/v1/capsules_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestCapsuleBase(t *testing.T) {
3232
TemplateOpts: template,
3333
}
3434

35-
v, err := capsules.Create(client, createOpts).Extract()
35+
v, err := capsules.Create(context.TODO(), client, createOpts).Extract()
3636
th.AssertNoErr(t, err)
3737
capsule := v.(*capsules.Capsule)
3838

@@ -50,12 +50,12 @@ func TestCapsuleBase(t *testing.T) {
5050
if capsuleUUID != capsule.UUID {
5151
continue
5252
}
53-
capsule, err := capsules.Get(client, capsuleUUID).ExtractBase()
53+
capsule, err := capsules.Get(context.TODO(), client, capsuleUUID).ExtractBase()
5454

5555
th.AssertNoErr(t, err)
5656
th.AssertEquals(t, capsule.MetaName, "template")
5757

58-
err = capsules.Delete(client, capsuleUUID).ExtractErr()
58+
err = capsules.Delete(context.TODO(), client, capsuleUUID).ExtractErr()
5959
th.AssertNoErr(t, err)
6060

6161
}
@@ -87,7 +87,7 @@ func TestCapsuleV132(t *testing.T) {
8787
TemplateOpts: template,
8888
}
8989

90-
capsule, err := capsules.Create(client, createOpts).ExtractV132()
90+
capsule, err := capsules.Create(context.TODO(), client, createOpts).ExtractV132()
9191
th.AssertNoErr(t, err)
9292

9393
err = WaitForCapsuleStatus(client, capsule.UUID, "Running")
@@ -103,12 +103,12 @@ func TestCapsuleV132(t *testing.T) {
103103
if capsuleUUID != capsule.UUID {
104104
continue
105105
}
106-
capsule, err := capsules.Get(client, capsuleUUID).ExtractV132()
106+
capsule, err := capsules.Get(context.TODO(), client, capsuleUUID).ExtractV132()
107107

108108
th.AssertNoErr(t, err)
109109
th.AssertEquals(t, capsule.MetaName, "template")
110110

111-
err = capsules.Delete(client, capsuleUUID).ExtractErr()
111+
err = capsules.Delete(context.TODO(), client, capsuleUUID).ExtractErr()
112112
th.AssertNoErr(t, err)
113113

114114
}

‎internal/acceptance/openstack/db/v1/configurations_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package v1
55

66
import (
7+
"context"
78
"testing"
89

910
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
@@ -38,12 +39,12 @@ func TestConfigurationsCRUD(t *testing.T) {
3839
values["collation_server"] = "latin1_swedish_ci"
3940
createOpts.Values = values
4041

41-
cgroup, err := configurations.Create(client, createOpts).Extract()
42+
cgroup, err := configurations.Create(context.TODO(), client, createOpts).Extract()
4243
if err != nil {
4344
t.Fatalf("Unable to create configuration: %v", err)
4445
}
4546

46-
readCgroup, err := configurations.Get(client, cgroup.ID).Extract()
47+
readCgroup, err := configurations.Get(context.TODO(), client, cgroup.ID).Extract()
4748
if err != nil {
4849
t.Fatalf("Unable to read configuration: %v", err)
4950
}
@@ -61,10 +62,10 @@ func TestConfigurationsCRUD(t *testing.T) {
6162
Name: newCgroupName,
6263
Description: &newCgroupDescription,
6364
}
64-
err = configurations.Update(client, cgroup.ID, updateOpts).ExtractErr()
65+
err = configurations.Update(context.TODO(), client, cgroup.ID, updateOpts).ExtractErr()
6566
th.AssertNoErr(t, err)
6667

67-
newCgroup, err := configurations.Get(client, cgroup.ID).Extract()
68+
newCgroup, err := configurations.Get(context.TODO(), client, cgroup.ID).Extract()
6869
if err != nil {
6970
t.Fatalf("Unable to read updated configuration: %v", err)
7071
}
@@ -73,7 +74,7 @@ func TestConfigurationsCRUD(t *testing.T) {
7374
th.AssertEquals(t, newCgroup.Name, newCgroupName)
7475
th.AssertEquals(t, newCgroup.Description, newCgroupDescription)
7576

76-
err = configurations.Delete(client, cgroup.ID).ExtractErr()
77+
err = configurations.Delete(context.TODO(), client, cgroup.ID).ExtractErr()
7778
if err != nil {
7879
t.Fatalf("Unable to delete configuration: %v", err)
7980
}

‎internal/acceptance/openstack/db/v1/flavors_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestFlavorsGet(t *testing.T) {
5050
}
5151

5252
if len(allFlavors) > 0 {
53-
flavor, err := flavors.Get(client, allFlavors[0].StrID).Extract()
53+
flavor, err := flavors.Get(context.TODO(), client, allFlavors[0].StrID).Extract()
5454
if err != nil {
5555
t.Fatalf("Unable to get flavor: %v", err)
5656
}

‎internal/acceptance/openstack/db/v1/instances_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ func TestInstances(t *testing.T) {
4848
}
4949

5050
// Enable root user.
51-
_, err = instances.EnableRootUser(client, instance.ID).Extract()
51+
_, err = instances.EnableRootUser(context.TODO(), client, instance.ID).Extract()
5252
if err != nil {
5353
t.Fatalf("Unable to enable root user: %v", err)
5454
}
5555

56-
enabled, err := instances.IsRootEnabled(client, instance.ID).Extract()
56+
enabled, err := instances.IsRootEnabled(context.TODO(), client, instance.ID).Extract()
5757
if err != nil {
5858
t.Fatalf("Unable to check if root user is enabled: %v", err)
5959
}
6060

6161
t.Logf("Root user is enabled: %t", enabled)
6262

6363
// Restart
64-
err = instances.Restart(client, instance.ID).ExtractErr()
64+
err = instances.Restart(context.TODO(), client, instance.ID).ExtractErr()
6565
if err != nil {
6666
t.Fatalf("Unable to restart instance: %v", err)
6767
}

‎internal/acceptance/openstack/dns/v2/recordsets_test.go

+10-11
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,13 @@ func TestRecordSetsListByZone(t *testing.T) {
4343
Limit: 1,
4444
}
4545

46-
err = recordsets.ListByZone(client, zone.ID, listOpts).EachPage(
47-
func(page pagination.Page) (bool, error) {
48-
rr, err := recordsets.ExtractRecordSets(page)
49-
th.AssertNoErr(t, err)
50-
th.AssertEquals(t, len(rr), 1)
51-
return true, nil
52-
},
53-
)
46+
pager := recordsets.ListByZone(client, zone.ID, listOpts)
47+
err = pager.EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
48+
rr, err := recordsets.ExtractRecordSets(page)
49+
th.AssertNoErr(t, err)
50+
th.AssertEquals(t, len(rr), 1)
51+
return true, nil
52+
})
5453
th.AssertNoErr(t, err)
5554
}
5655

@@ -75,7 +74,7 @@ func TestRecordSetsCRUD(t *testing.T) {
7574
Description: &description,
7675
}
7776

78-
newRS, err := recordsets.Update(client, rs.ZoneID, rs.ID, updateOpts).Extract()
77+
newRS, err := recordsets.Update(context.TODO(), client, rs.ZoneID, rs.ID, updateOpts).Extract()
7978
th.AssertNoErr(t, err)
8079

8180
tools.PrintResource(t, &newRS)
@@ -87,7 +86,7 @@ func TestRecordSetsCRUD(t *testing.T) {
8786
Records: records,
8887
}
8988

90-
newRS, err = recordsets.Update(client, rs.ZoneID, rs.ID, updateOpts).Extract()
89+
newRS, err = recordsets.Update(context.TODO(), client, rs.ZoneID, rs.ID, updateOpts).Extract()
9190
th.AssertNoErr(t, err)
9291

9392
tools.PrintResource(t, &newRS)
@@ -100,7 +99,7 @@ func TestRecordSetsCRUD(t *testing.T) {
10099
TTL: &ttl,
101100
}
102101

103-
newRS, err = recordsets.Update(client, rs.ZoneID, rs.ID, updateOpts).Extract()
102+
newRS, err = recordsets.Update(context.TODO(), client, rs.ZoneID, rs.ID, updateOpts).Extract()
104103
th.AssertNoErr(t, err)
105104

106105
tools.PrintResource(t, &newRS)

‎internal/acceptance/openstack/dns/v2/transfers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestTransferRequestCRUD(t *testing.T) {
4949
Description: description,
5050
}
5151

52-
newTransferRequest, err := transferRequests.Update(client, transferRequest.ID, updateOpts).Extract()
52+
newTransferRequest, err := transferRequests.Update(context.TODO(), client, transferRequest.ID, updateOpts).Extract()
5353
th.AssertNoErr(t, err)
5454

5555
tools.PrintResource(t, &newTransferRequest)

‎internal/acceptance/openstack/dns/v2/zones_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestZonesCRUD(t *testing.T) {
4646
TTL: 0,
4747
}
4848

49-
newZone, err := zones.Update(client, zone.ID, updateOpts).Extract()
49+
newZone, err := zones.Update(context.TODO(), client, zone.ID, updateOpts).Extract()
5050
th.AssertNoErr(t, err)
5151

5252
tools.PrintResource(t, &newZone)

‎internal/acceptance/openstack/networking/v2/extensions/fwaas/firewall_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ func TestFirewallCRUDRouter(t *testing.T) {
115115
}
116116

117117
updateOpts := routerinsertion.UpdateOptsExt{
118-
firewallUpdateOpts,
119-
[]string{router2.ID},
118+
UpdateOptsBuilder: firewallUpdateOpts,
119+
RouterIDs: []string{router2.ID},
120120
}
121121

122122
_, err = firewalls.Update(context.TODO(), client, firewall.ID, updateOpts).Extract()
@@ -162,8 +162,8 @@ func TestFirewallCRUDRemoveRouter(t *testing.T) {
162162
}
163163

164164
updateOpts := routerinsertion.UpdateOptsExt{
165-
firewallUpdateOpts,
166-
[]string{},
165+
UpdateOptsBuilder: firewallUpdateOpts,
166+
RouterIDs: []string{},
167167
}
168168

169169
_, err = firewalls.Update(context.TODO(), client, firewall.ID, updateOpts).Extract()

0 commit comments

Comments
 (0)