Skip to content

Commit 04349e7

Browse files
mandremandre
committed
Bump gophercloud
Unfortunatly, gophercloud v2.8.0 changed the signature of the ServiceClient() testhelper function. We need to replicate the changes from gophercloud/gophercloud@eed41cd here. Namely: Create a "FakeServer" instance instead of configuring the global fake: sed -i 's/th.SetupHTTP/fakeServer := th.SetupHTTP/g' $(ag 'th.SetupHTTP' -l) Tear down this instance on test completion: sed -i 's/defer th.TeardownHTTP/defer fakeServer.Teardown/g' $(ag 'defer th.TeardownHTTP' -l) Update calls to the global 'Mux' instance with calls to the FakeServer version: sed -i 's/th.Mux.HandleFunc/fakeServer.Mux.HandleFunc/g' $(ag 'th.Mux.HandleFunc' -l) Update calls to ServiceClient to include a 'FakeServer' parameter: sed -i 's/client.ServiceClient()/client.ServiceClient(fakeServer)/' $(ag -w client.ServiceClient -l) Plus alises for the same: sed -i 's/fake.ServiceClient()/fake.ServiceClient(fakeServer)/' $(ag 'fake.ServiceClient' -l) Update definitions and calls to various MockFoo and HandleFoo helpers - plus lowercase, private variants of same - to include a 'FakeServer' parameter: sed -i 's/\(func Mock\w\+(t \*testing.T\)/\1, fakeServer th.FakeServer/' $(ag 'func Mock\w+\(t \*testing.T' -l) sed -i 's/\(\tMock\w\+(t\)/\1, fakeServer/' $(ag '\tMock\w+\(t' -l) sed -i 's/\(func mock\w\+(t \*testing.T\)/\1, fakeServer th.FakeServer/' $(ag 'func mock\w+\(t \*testing.T' -l) sed -i 's/\(\tmock\w\+(t\)/\1, fakeServer/' $(ag '\tmock\w+\(t' -l) sed -i 's/\(func Handle\w\+(t \*testing.T\)/\1, fakeServer th.FakeServer/' $(ag 'func Handle\w+\(t \*testing.T' -l) sed -i 's/\(\tHandle\w\+(t\)/\1, fakeServer/' $(ag '\tHandle\w+\(t' -l) sed -i 's/\(func handle\w\+(t \*testing.T\)/\1, fakeServer th.FakeServer/' $(ag 'func handle\w+\(t \*testing.T' -l) sed -i 's/\(\thandle\w\+(t\)/\1, fakeServer/' $(ag '\thandle\w+\(t' -l)
1 parent e90e77b commit 04349e7

File tree

11 files changed

+133
-132
lines changed

11 files changed

+133
-132
lines changed

‎gnocchi/metric/v1/archivepolicies/testing/requests_test.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
)
1414

1515
func TestListArchivePolicies(t *testing.T) {
16-
th.SetupHTTP()
17-
defer th.TeardownHTTP()
16+
fakeServer := th.SetupHTTP()
17+
defer fakeServer.Teardown()
1818

19-
th.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
19+
fakeServer.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
2020
th.TestMethod(t, r, "GET")
2121
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
2222

@@ -28,7 +28,7 @@ func TestListArchivePolicies(t *testing.T) {
2828

2929
expected := ListArchivePoliciesExpected
3030
pages := 0
31-
err := archivepolicies.List(fake.ServiceClient()).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
31+
err := archivepolicies.List(fake.ServiceClient(fakeServer)).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
3232
pages++
3333

3434
actual, err := archivepolicies.ExtractArchivePolicies(page)
@@ -46,10 +46,10 @@ func TestListArchivePolicies(t *testing.T) {
4646
}
4747

4848
func TestListArchivePoliciesAllPages(t *testing.T) {
49-
th.SetupHTTP()
50-
defer th.TeardownHTTP()
49+
fakeServer := th.SetupHTTP()
50+
defer fakeServer.Teardown()
5151

52-
th.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
52+
fakeServer.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
5353
th.TestMethod(t, r, "GET")
5454
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
5555

@@ -59,17 +59,17 @@ func TestListArchivePoliciesAllPages(t *testing.T) {
5959
fmt.Fprint(w, ArchivePoliciesListResult)
6060
})
6161

62-
allPages, err := archivepolicies.List(fake.ServiceClient()).AllPages(context.TODO())
62+
allPages, err := archivepolicies.List(fake.ServiceClient(fakeServer)).AllPages(context.TODO())
6363
th.AssertNoErr(t, err)
6464
_, err = archivepolicies.ExtractArchivePolicies(allPages)
6565
th.AssertNoErr(t, err)
6666
}
6767

6868
func TestGetArchivePolicy(t *testing.T) {
69-
th.SetupHTTP()
70-
defer th.TeardownHTTP()
69+
fakeServer := th.SetupHTTP()
70+
defer fakeServer.Teardown()
7171

72-
th.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
72+
fakeServer.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
7373
th.TestMethod(t, r, "GET")
7474
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
7575

@@ -79,7 +79,7 @@ func TestGetArchivePolicy(t *testing.T) {
7979
fmt.Fprint(w, ArchivePolicyGetResult)
8080
})
8181

82-
s, err := archivepolicies.Get(context.TODO(), fake.ServiceClient(), "test_policy").Extract()
82+
s, err := archivepolicies.Get(context.TODO(), fake.ServiceClient(fakeServer), "test_policy").Extract()
8383
th.AssertNoErr(t, err)
8484

8585
th.AssertDeepEquals(t, s.AggregationMethods, []string{
@@ -104,10 +104,10 @@ func TestGetArchivePolicy(t *testing.T) {
104104
}
105105

106106
func TestCreate(t *testing.T) {
107-
th.SetupHTTP()
108-
defer th.TeardownHTTP()
107+
fakeServer := th.SetupHTTP()
108+
defer fakeServer.Teardown()
109109

110-
th.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
110+
fakeServer.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
111111
th.TestMethod(t, r, "POST")
112112
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
113113
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -139,7 +139,7 @@ func TestCreate(t *testing.T) {
139139
},
140140
Name: "test_policy",
141141
}
142-
s, err := archivepolicies.Create(context.TODO(), fake.ServiceClient(), opts).Extract()
142+
s, err := archivepolicies.Create(context.TODO(), fake.ServiceClient(fakeServer), opts).Extract()
143143
th.AssertNoErr(t, err)
144144

145145
th.AssertDeepEquals(t, s.AggregationMethods, []string{
@@ -164,10 +164,10 @@ func TestCreate(t *testing.T) {
164164
}
165165

166166
func TestUpdateArchivePolicy(t *testing.T) {
167-
th.SetupHTTP()
168-
defer th.TeardownHTTP()
167+
fakeServer := th.SetupHTTP()
168+
defer fakeServer.Teardown()
169169

170-
th.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
170+
fakeServer.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
171171
th.TestMethod(t, r, "PATCH")
172172
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
173173
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -192,7 +192,7 @@ func TestUpdateArchivePolicy(t *testing.T) {
192192
},
193193
},
194194
}
195-
s, err := archivepolicies.Update(context.TODO(), fake.ServiceClient(), "test_policy", updateOpts).Extract()
195+
s, err := archivepolicies.Update(context.TODO(), fake.ServiceClient(fakeServer), "test_policy", updateOpts).Extract()
196196
th.AssertNoErr(t, err)
197197

198198
th.AssertDeepEquals(t, s.AggregationMethods, []string{
@@ -215,15 +215,15 @@ func TestUpdateArchivePolicy(t *testing.T) {
215215
}
216216

217217
func TestDelete(t *testing.T) {
218-
th.SetupHTTP()
219-
defer th.TeardownHTTP()
218+
fakeServer := th.SetupHTTP()
219+
defer fakeServer.Teardown()
220220

221-
th.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
221+
fakeServer.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
222222
th.TestMethod(t, r, "DELETE")
223223
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
224224
w.WriteHeader(http.StatusNoContent)
225225
})
226226

227-
res := archivepolicies.Delete(context.TODO(), fake.ServiceClient(), "test_policy")
227+
res := archivepolicies.Delete(context.TODO(), fake.ServiceClient(fakeServer), "test_policy")
228228
th.AssertNoErr(t, res.Err)
229229
}

‎gnocchi/metric/v1/measures/testing/requests_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
)
1515

1616
func TestListMeasures(t *testing.T) {
17-
th.SetupHTTP()
18-
defer th.TeardownHTTP()
17+
fakeServer := th.SetupHTTP()
18+
defer fakeServer.Teardown()
1919

20-
th.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
20+
fakeServer.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
2121
th.TestMethod(t, r, "GET")
2222
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
2323

@@ -37,7 +37,7 @@ func TestListMeasures(t *testing.T) {
3737
}
3838
expected := ListMeasuresExpected
3939
pages := 0
40-
err := measures.List(fake.ServiceClient(), metricID, opts).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
40+
err := measures.List(fake.ServiceClient(fakeServer), metricID, opts).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
4141
pages++
4242

4343
actual, err := measures.ExtractMeasures(page)
@@ -55,10 +55,10 @@ func TestListMeasures(t *testing.T) {
5555
}
5656

5757
func TestCreateMeasures(t *testing.T) {
58-
th.SetupHTTP()
59-
defer th.TeardownHTTP()
58+
fakeServer := th.SetupHTTP()
59+
defer fakeServer.Teardown()
6060

61-
th.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
61+
fakeServer.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
6262
th.TestMethod(t, r, "POST")
6363
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
6464
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -81,15 +81,15 @@ func TestCreateMeasures(t *testing.T) {
8181
},
8282
},
8383
}
84-
res := measures.Create(context.TODO(), fake.ServiceClient(), "9e5a6441-1044-4181-b66e-34e180753040", createOpts)
84+
res := measures.Create(context.TODO(), fake.ServiceClient(fakeServer), "9e5a6441-1044-4181-b66e-34e180753040", createOpts)
8585
th.AssertNoErr(t, res.Err)
8686
}
8787

8888
func TestBatchCreateMetrics(t *testing.T) {
89-
th.SetupHTTP()
90-
defer th.TeardownHTTP()
89+
fakeServer := th.SetupHTTP()
90+
defer fakeServer.Teardown()
9191

92-
th.Mux.HandleFunc("/v1/batch/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
92+
fakeServer.Mux.HandleFunc("/v1/batch/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
9393
th.TestMethod(t, r, "POST")
9494
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
9595
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -128,15 +128,15 @@ func TestBatchCreateMetrics(t *testing.T) {
128128
},
129129
},
130130
}
131-
err := measures.BatchCreateMetrics(context.TODO(), fake.ServiceClient(), createOpts).ExtractErr()
131+
err := measures.BatchCreateMetrics(context.TODO(), fake.ServiceClient(fakeServer), createOpts).ExtractErr()
132132
th.AssertNoErr(t, err)
133133
}
134134

135135
func TestBatchCreateResourcesMetrics(t *testing.T) {
136-
th.SetupHTTP()
137-
defer th.TeardownHTTP()
136+
fakeServer := th.SetupHTTP()
137+
defer fakeServer.Teardown()
138138

139-
th.Mux.HandleFunc("/v1/batch/resources/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
139+
fakeServer.Mux.HandleFunc("/v1/batch/resources/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
140140
th.TestMethod(t, r, "POST")
141141
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
142142
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -207,6 +207,6 @@ func TestBatchCreateResourcesMetrics(t *testing.T) {
207207
},
208208
},
209209
}
210-
err := measures.BatchCreateResourcesMetrics(context.TODO(), fake.ServiceClient(), createOpts).ExtractErr()
210+
err := measures.BatchCreateResourcesMetrics(context.TODO(), fake.ServiceClient(fakeServer), createOpts).ExtractErr()
211211
th.AssertNoErr(t, err)
212212
}

‎gnocchi/metric/v1/metrics/testing/requests_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
)
1717

1818
func TestList(t *testing.T) {
19-
th.SetupHTTP()
20-
defer th.TeardownHTTP()
19+
fakeServer := th.SetupHTTP()
20+
defer fakeServer.Teardown()
2121

22-
th.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
22+
fakeServer.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
2323
th.TestMethod(t, r, "GET")
2424
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
2525

@@ -40,7 +40,7 @@ func TestList(t *testing.T) {
4040

4141
count := 0
4242

43-
err := metrics.List(fake.ServiceClient(), metrics.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
43+
err := metrics.List(fake.ServiceClient(fakeServer), metrics.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
4444
count++
4545
actual, err := metrics.ExtractMetrics(page)
4646
if err != nil {
@@ -65,10 +65,10 @@ func TestList(t *testing.T) {
6565
}
6666

6767
func TestGet(t *testing.T) {
68-
th.SetupHTTP()
69-
defer th.TeardownHTTP()
68+
fakeServer := th.SetupHTTP()
69+
defer fakeServer.Teardown()
7070

71-
th.Mux.HandleFunc("/v1/metric/0ddf61cf-3747-4f75-bf13-13c28ff03ae3", func(w http.ResponseWriter, r *http.Request) {
71+
fakeServer.Mux.HandleFunc("/v1/metric/0ddf61cf-3747-4f75-bf13-13c28ff03ae3", func(w http.ResponseWriter, r *http.Request) {
7272
th.TestMethod(t, r, "GET")
7373
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
7474

@@ -78,7 +78,7 @@ func TestGet(t *testing.T) {
7878
fmt.Fprint(w, MetricGetResult)
7979
})
8080

81-
s, err := metrics.Get(context.TODO(), fake.ServiceClient(), "0ddf61cf-3747-4f75-bf13-13c28ff03ae3").Extract()
81+
s, err := metrics.Get(context.TODO(), fake.ServiceClient(fakeServer), "0ddf61cf-3747-4f75-bf13-13c28ff03ae3").Extract()
8282
th.AssertNoErr(t, err)
8383

8484
th.AssertDeepEquals(t, s.ArchivePolicy, archivepolicies.ArchivePolicy{
@@ -125,10 +125,10 @@ func TestGet(t *testing.T) {
125125
}
126126

127127
func TestCreate(t *testing.T) {
128-
th.SetupHTTP()
129-
defer th.TeardownHTTP()
128+
fakeServer := th.SetupHTTP()
129+
defer fakeServer.Teardown()
130130

131-
th.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
131+
fakeServer.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
132132
th.TestMethod(t, r, "POST")
133133
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
134134
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -147,7 +147,7 @@ func TestCreate(t *testing.T) {
147147
ResourceID: "23d5d3f7-9dfa-4f73-b72b-8b0b0063ec55",
148148
Unit: "B/s",
149149
}
150-
s, err := metrics.Create(context.TODO(), fake.ServiceClient(), opts).Extract()
150+
s, err := metrics.Create(context.TODO(), fake.ServiceClient(fakeServer), opts).Extract()
151151
th.AssertNoErr(t, err)
152152

153153
th.AssertEquals(t, s.ArchivePolicyName, "high")
@@ -161,15 +161,15 @@ func TestCreate(t *testing.T) {
161161
}
162162

163163
func TestDelete(t *testing.T) {
164-
th.SetupHTTP()
165-
defer th.TeardownHTTP()
164+
fakeServer := th.SetupHTTP()
165+
defer fakeServer.Teardown()
166166

167-
th.Mux.HandleFunc("/v1/metric/01b2953e-de74-448a-a305-c84440697933", func(w http.ResponseWriter, r *http.Request) {
167+
fakeServer.Mux.HandleFunc("/v1/metric/01b2953e-de74-448a-a305-c84440697933", func(w http.ResponseWriter, r *http.Request) {
168168
th.TestMethod(t, r, "DELETE")
169169
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
170170
w.WriteHeader(http.StatusNoContent)
171171
})
172172

173-
res := metrics.Delete(context.TODO(), fake.ServiceClient(), "01b2953e-de74-448a-a305-c84440697933")
173+
res := metrics.Delete(context.TODO(), fake.ServiceClient(fakeServer), "01b2953e-de74-448a-a305-c84440697933")
174174
th.AssertNoErr(t, res.Err)
175175
}

0 commit comments

Comments
 (0)