Skip to content

Commit 7992df9

Browse files
majewskymajewsky
committed
update to new gophercloud/v2/testhelper API
1 parent 1563923 commit 7992df9

File tree

31 files changed

+445
-445
lines changed

31 files changed

+445
-445
lines changed

‎arc/v1/agents/testing/requests_test.go‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/gophercloud/gophercloud/v2/pagination"
1515
th "github.com/gophercloud/gophercloud/v2/testhelper"
16-
fake "github.com/gophercloud/gophercloud/v2/testhelper/client"
16+
"github.com/gophercloud/gophercloud/v2/testhelper/client"
1717

1818
"github.com/sapcc/gophercloud-sapcc/v2/arc/v1/agents"
1919
)
@@ -60,12 +60,12 @@ var agentsList = []agents.Agent{
6060
}
6161

6262
func TestList(t *testing.T) {
63-
th.SetupHTTP()
64-
defer th.TeardownHTTP()
63+
fakeServer := th.SetupHTTP()
64+
defer fakeServer.Teardown()
6565

66-
th.Mux.HandleFunc("/agents", func(w http.ResponseWriter, r *http.Request) {
66+
fakeServer.Mux.HandleFunc("/agents", func(w http.ResponseWriter, r *http.Request) {
6767
th.TestMethod(t, r, http.MethodGet)
68-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
68+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
6969

7070
w.Header().Add("Content-Type", "application/json")
7171
w.WriteHeader(http.StatusOK)
@@ -76,7 +76,7 @@ func TestList(t *testing.T) {
7676
count := 0
7777

7878
//nolint:errcheck
79-
agents.List(fake.ServiceClient(), agents.ListOpts{}).EachPage(t.Context(), func(ctx context.Context, page pagination.Page) (bool, error) {
79+
agents.List(client.ServiceClient(fakeServer), agents.ListOpts{}).EachPage(t.Context(), func(ctx context.Context, page pagination.Page) (bool, error) {
8080
count++
8181
actual, err := agents.ExtractAgents(page)
8282
if err != nil {
@@ -95,32 +95,32 @@ func TestList(t *testing.T) {
9595
}
9696

9797
func TestGet(t *testing.T) {
98-
th.SetupHTTP()
99-
defer th.TeardownHTTP()
98+
fakeServer := th.SetupHTTP()
99+
defer fakeServer.Teardown()
100100

101-
th.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1", func(w http.ResponseWriter, r *http.Request) {
101+
fakeServer.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1", func(w http.ResponseWriter, r *http.Request) {
102102
th.TestMethod(t, r, http.MethodGet)
103-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
103+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
104104

105105
w.Header().Add("Content-Type", "application/json")
106106
w.WriteHeader(http.StatusOK)
107107

108108
fmt.Fprint(w, GetResponse)
109109
})
110110

111-
n, err := agents.Get(t.Context(), fake.ServiceClient(), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
111+
n, err := agents.Get(t.Context(), client.ServiceClient(fakeServer), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
112112
th.AssertNoErr(t, err)
113113

114114
th.AssertDeepEquals(t, *n, agentsList[0])
115115
}
116116

117117
func TestInit(t *testing.T) {
118-
th.SetupHTTP()
119-
defer th.TeardownHTTP()
118+
fakeServer := th.SetupHTTP()
119+
defer fakeServer.Teardown()
120120

121-
th.Mux.HandleFunc("/agents/init", func(w http.ResponseWriter, r *http.Request) {
121+
fakeServer.Mux.HandleFunc("/agents/init", func(w http.ResponseWriter, r *http.Request) {
122122
th.TestMethod(t, r, http.MethodPost)
123-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
123+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
124124
th.TestHeader(t, r, "Accept", "text/x-powershellscript")
125125

126126
w.Header().Add("Content-Type", "text/x-powershellscript")
@@ -132,7 +132,7 @@ func TestInit(t *testing.T) {
132132
options := agents.InitOpts{
133133
Accept: "text/x-powershellscript",
134134
}
135-
response := agents.Init(t.Context(), fake.ServiceClient(), options)
135+
response := agents.Init(t.Context(), client.ServiceClient(fakeServer), options)
136136
th.AssertNoErr(t, response.Err)
137137

138138
expectedHeader := &agents.InitHeader{ContentType: "text/x-powershellscript"}
@@ -148,12 +148,12 @@ func TestInit(t *testing.T) {
148148
}
149149

150150
func TestInitJSON(t *testing.T) {
151-
th.SetupHTTP()
152-
defer th.TeardownHTTP()
151+
fakeServer := th.SetupHTTP()
152+
defer fakeServer.Teardown()
153153

154-
th.Mux.HandleFunc("/agents/init", func(w http.ResponseWriter, r *http.Request) {
154+
fakeServer.Mux.HandleFunc("/agents/init", func(w http.ResponseWriter, r *http.Request) {
155155
th.TestMethod(t, r, http.MethodPost)
156-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
156+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
157157
th.TestHeader(t, r, "Accept", "application/json")
158158

159159
w.Header().Add("Content-Type", "application/json")
@@ -173,7 +173,7 @@ func TestInitJSON(t *testing.T) {
173173
options := agents.InitOpts{
174174
Accept: "application/json",
175175
}
176-
response := agents.Init(t.Context(), fake.ServiceClient(), options)
176+
response := agents.Init(t.Context(), client.ServiceClient(fakeServer), options)
177177
th.AssertNoErr(t, response.Err)
178178

179179
expectedHeader := &agents.InitHeader{ContentType: "application/json"}
@@ -196,99 +196,99 @@ func TestInitJSON(t *testing.T) {
196196
// TODO required headers
197197
/*
198198
func TestRequiredInitOpts(t *testing.T) {
199-
th.SetupHTTP()
200-
defer th.TeardownHTTP()
199+
fakeServer := th.SetupHTTP()
200+
defer fakeServer.Teardown()
201201
202-
res := agents.Init(fake.ServiceClient(), agents.InitOpts{})
202+
res := agents.Init(client.ServiceClient(fakeServer), agents.InitOpts{})
203203
if res.Err == nil || !strings.Contains(fmt.Sprintf("%s", res.Err), "Missing input for argument") {
204204
t.Fatalf("Expected error, got none")
205205
}
206206
}
207207
*/
208208

209209
func TestDelete(t *testing.T) {
210-
th.SetupHTTP()
211-
defer th.TeardownHTTP()
210+
fakeServer := th.SetupHTTP()
211+
defer fakeServer.Teardown()
212212

213-
th.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1", func(w http.ResponseWriter, r *http.Request) {
213+
fakeServer.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1", func(w http.ResponseWriter, r *http.Request) {
214214
th.TestMethod(t, r, "DELETE")
215-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
215+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
216216

217217
w.Header().Add("Content-Type", "application/json")
218218
w.WriteHeader(http.StatusNoContent)
219219
})
220220

221-
err := agents.Delete(t.Context(), fake.ServiceClient(), "88e5cad3-38e6-454f-b412-662cda03e7a1").ExtractErr()
221+
err := agents.Delete(t.Context(), client.ServiceClient(fakeServer), "88e5cad3-38e6-454f-b412-662cda03e7a1").ExtractErr()
222222
th.AssertNoErr(t, err)
223223
}
224224

225225
func TestGetTags(t *testing.T) {
226-
th.SetupHTTP()
227-
defer th.TeardownHTTP()
226+
fakeServer := th.SetupHTTP()
227+
defer fakeServer.Teardown()
228228

229-
th.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/tags", func(w http.ResponseWriter, r *http.Request) {
229+
fakeServer.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/tags", func(w http.ResponseWriter, r *http.Request) {
230230
th.TestMethod(t, r, http.MethodGet)
231-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
231+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
232232

233233
w.Header().Add("Content-Type", "application/json")
234234
w.WriteHeader(http.StatusOK)
235235

236236
fmt.Fprint(w, GetTagsResponse)
237237
})
238238

239-
n, err := agents.GetTags(t.Context(), fake.ServiceClient(), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
239+
n, err := agents.GetTags(t.Context(), client.ServiceClient(fakeServer), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
240240
th.AssertNoErr(t, err)
241241

242242
th.AssertDeepEquals(t, n, agentTags)
243243
}
244244

245245
func TestCreateTag(t *testing.T) {
246-
th.SetupHTTP()
247-
defer th.TeardownHTTP()
246+
fakeServer := th.SetupHTTP()
247+
defer fakeServer.Teardown()
248248

249-
th.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/tags", func(w http.ResponseWriter, r *http.Request) {
249+
fakeServer.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/tags", func(w http.ResponseWriter, r *http.Request) {
250250
th.TestMethod(t, r, http.MethodPost)
251-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
251+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
252252

253253
w.Header().Add("Content-Type", "application/json")
254254
w.WriteHeader(http.StatusNoContent)
255255
})
256256

257-
err := agents.CreateTags(t.Context(), fake.ServiceClient(), "88e5cad3-38e6-454f-b412-662cda03e7a1", agentTags).ExtractErr()
257+
err := agents.CreateTags(t.Context(), client.ServiceClient(fakeServer), "88e5cad3-38e6-454f-b412-662cda03e7a1", agentTags).ExtractErr()
258258
th.AssertNoErr(t, err)
259259
}
260260

261261
func TestDeleteTag(t *testing.T) {
262-
th.SetupHTTP()
263-
defer th.TeardownHTTP()
262+
fakeServer := th.SetupHTTP()
263+
defer fakeServer.Teardown()
264264

265-
th.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/tags/pool", func(w http.ResponseWriter, r *http.Request) {
265+
fakeServer.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/tags/pool", func(w http.ResponseWriter, r *http.Request) {
266266
th.TestMethod(t, r, "DELETE")
267-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
267+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
268268

269269
w.Header().Add("Content-Type", "application/json")
270270
w.WriteHeader(http.StatusNoContent)
271271
})
272272

273-
err := agents.DeleteTag(t.Context(), fake.ServiceClient(), "88e5cad3-38e6-454f-b412-662cda03e7a1", "pool").ExtractErr()
273+
err := agents.DeleteTag(t.Context(), client.ServiceClient(fakeServer), "88e5cad3-38e6-454f-b412-662cda03e7a1", "pool").ExtractErr()
274274
th.AssertNoErr(t, err)
275275
}
276276

277277
func TestGetFacts(t *testing.T) {
278-
th.SetupHTTP()
279-
defer th.TeardownHTTP()
278+
fakeServer := th.SetupHTTP()
279+
defer fakeServer.Teardown()
280280

281-
th.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/facts", func(w http.ResponseWriter, r *http.Request) {
281+
fakeServer.Mux.HandleFunc("/agents/88e5cad3-38e6-454f-b412-662cda03e7a1/facts", func(w http.ResponseWriter, r *http.Request) {
282282
th.TestMethod(t, r, http.MethodGet)
283-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
283+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
284284

285285
w.Header().Add("Content-Type", "application/json")
286286
w.WriteHeader(http.StatusOK)
287287

288288
fmt.Fprint(w, GetFactsResponse)
289289
})
290290

291-
n, err := agents.GetFacts(t.Context(), fake.ServiceClient(), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
291+
n, err := agents.GetFacts(t.Context(), client.ServiceClient(fakeServer), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
292292
th.AssertNoErr(t, err)
293293

294294
th.AssertDeepEquals(t, n, agentFacts)

‎arc/v1/jobs/testing/requests_test.go‎

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

1414
"github.com/gophercloud/gophercloud/v2/pagination"
1515
th "github.com/gophercloud/gophercloud/v2/testhelper"
16-
fake "github.com/gophercloud/gophercloud/v2/testhelper/client"
16+
"github.com/gophercloud/gophercloud/v2/testhelper/client"
1717

1818
"github.com/sapcc/gophercloud-sapcc/v2/arc/v1/jobs"
1919
)
@@ -64,12 +64,12 @@ var jobsList = []jobs.Job{
6464
}
6565

6666
func TestList(t *testing.T) {
67-
th.SetupHTTP()
68-
defer th.TeardownHTTP()
67+
fakeServer := th.SetupHTTP()
68+
defer fakeServer.Teardown()
6969

70-
th.Mux.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) {
70+
fakeServer.Mux.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) {
7171
th.TestMethod(t, r, http.MethodGet)
72-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
72+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
7373

7474
w.Header().Add("Content-Type", "application/json")
7575
w.WriteHeader(http.StatusOK)
@@ -80,7 +80,7 @@ func TestList(t *testing.T) {
8080
count := 0
8181

8282
//nolint:errcheck
83-
jobs.List(fake.ServiceClient(), jobs.ListOpts{}).EachPage(t.Context(), func(ctx context.Context, page pagination.Page) (bool, error) {
83+
jobs.List(client.ServiceClient(fakeServer), jobs.ListOpts{}).EachPage(t.Context(), func(ctx context.Context, page pagination.Page) (bool, error) {
8484
count++
8585
actual, err := jobs.ExtractJobs(page)
8686
if err != nil {
@@ -99,32 +99,32 @@ func TestList(t *testing.T) {
9999
}
100100

101101
func TestGet(t *testing.T) {
102-
th.SetupHTTP()
103-
defer th.TeardownHTTP()
102+
fakeServer := th.SetupHTTP()
103+
defer fakeServer.Teardown()
104104

105-
th.Mux.HandleFunc("/jobs/88e5cad3-38e6-454f-b412-662cda03e7a1", func(w http.ResponseWriter, r *http.Request) {
105+
fakeServer.Mux.HandleFunc("/jobs/88e5cad3-38e6-454f-b412-662cda03e7a1", func(w http.ResponseWriter, r *http.Request) {
106106
th.TestMethod(t, r, http.MethodGet)
107-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
107+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
108108

109109
w.Header().Add("Content-Type", "application/json")
110110
w.WriteHeader(http.StatusOK)
111111

112112
fmt.Fprint(w, GetResponse)
113113
})
114114

115-
n, err := jobs.Get(t.Context(), fake.ServiceClient(), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
115+
n, err := jobs.Get(t.Context(), client.ServiceClient(fakeServer), "88e5cad3-38e6-454f-b412-662cda03e7a1").Extract()
116116
th.AssertNoErr(t, err)
117117

118118
th.AssertDeepEquals(t, *n, jobsList[1])
119119
}
120120

121121
func TestCreate(t *testing.T) {
122-
th.SetupHTTP()
123-
defer th.TeardownHTTP()
122+
fakeServer := th.SetupHTTP()
123+
defer fakeServer.Teardown()
124124

125-
th.Mux.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) {
125+
fakeServer.Mux.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) {
126126
th.TestMethod(t, r, http.MethodPost)
127-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
127+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
128128
th.TestHeader(t, r, "Content-Type", "application/json")
129129
th.TestHeader(t, r, "Accept", "application/json")
130130
th.TestJSONRequest(t, r, CreateRequest)
@@ -142,25 +142,25 @@ func TestCreate(t *testing.T) {
142142
Action: "script",
143143
Payload: "echo \"Script start\"\n\nfor i in {1..10}\ndo\n\techo $i\n sleep 1s\ndone\n\necho \"Script done\"",
144144
}
145-
_, err := jobs.Create(t.Context(), fake.ServiceClient(), options).Extract()
145+
_, err := jobs.Create(t.Context(), client.ServiceClient(fakeServer), options).Extract()
146146
th.AssertNoErr(t, err)
147147
}
148148

149149
func TestGetLog(t *testing.T) {
150-
th.SetupHTTP()
151-
defer th.TeardownHTTP()
150+
fakeServer := th.SetupHTTP()
151+
defer fakeServer.Teardown()
152152

153-
th.Mux.HandleFunc("/jobs/7ec336bd-fcd1-42af-a663-da578dd0b224/log", func(w http.ResponseWriter, r *http.Request) {
153+
fakeServer.Mux.HandleFunc("/jobs/7ec336bd-fcd1-42af-a663-da578dd0b224/log", func(w http.ResponseWriter, r *http.Request) {
154154
th.TestMethod(t, r, http.MethodGet)
155-
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
155+
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
156156

157157
w.Header().Add("Content-Type", "text/plain; charset=utf-8")
158158
w.WriteHeader(http.StatusOK)
159159

160160
fmt.Fprint(w, LogResponse)
161161
})
162162

163-
response := jobs.GetLog(t.Context(), fake.ServiceClient(), "7ec336bd-fcd1-42af-a663-da578dd0b224")
163+
response := jobs.GetLog(t.Context(), client.ServiceClient(fakeServer), "7ec336bd-fcd1-42af-a663-da578dd0b224")
164164
th.AssertNoErr(t, response.Err)
165165

166166
expectedHeader := &jobs.GetLogHeader{ContentType: "text/plain; charset=utf-8"}
@@ -176,10 +176,10 @@ func TestGetLog(t *testing.T) {
176176
}
177177

178178
func TestRequiredCreateOpts(t *testing.T) {
179-
th.SetupHTTP()
180-
defer th.TeardownHTTP()
179+
fakeServer := th.SetupHTTP()
180+
defer fakeServer.Teardown()
181181

182-
res := jobs.Create(t.Context(), fake.ServiceClient(), jobs.CreateOpts{})
182+
res := jobs.Create(t.Context(), client.ServiceClient(fakeServer), jobs.CreateOpts{})
183183
if res.Err == nil || !strings.Contains(res.Err.Error(), "Missing input for argument") {
184184
t.Fatalf("Expected error, got none")
185185
}

0 commit comments

Comments
 (0)