Skip to content

Commit 6b9310a

Browse files
Honny1Honny1
committed
test: refactor search_test.go to use helper functions and PodmanExitCleanly
Signed-off-by: Jan Rodák <[email protected]>
1 parent 91ff780 commit 6b9310a

File tree

1 file changed

+62
-159
lines changed

1 file changed

+62
-159
lines changed

‎test/e2e/search_test.go‎

Lines changed: 62 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,37 @@ registries = ['{{.Host}}:{{.Port}}']
4343
registries = []`
4444
registryFileBadTmpl := template.Must(template.New("registryFileBad").Parse(badRegFileContents))
4545

46+
mockFakeRegistryServerAsContainer := func(name string) endpoint {
47+
if podmanTest.Host.Arch == "ppc64le" {
48+
Skip("No registry image for ppc64le")
49+
}
50+
port := GetPort()
51+
fakereg := podmanTest.Podman([]string{"run", "-d", "--name", name,
52+
"-p", fmt.Sprintf("%d:5000", port),
53+
REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"})
54+
fakereg.WaitWithDefaultTimeout()
55+
Expect(fakereg).Should(ExitCleanly())
56+
57+
if !WaitContainerReady(podmanTest, name, "listening on", 20, 1) {
58+
Fail("Cannot start docker registry on port %s", port)
59+
}
60+
ep := endpoint{Port: strconv.Itoa(port), Host: "localhost"}
61+
return ep
62+
}
63+
64+
pushAlpineImageIntoMockRegistry := func(ep endpoint) string {
65+
err = podmanTest.RestoreArtifact(ALPINE)
66+
Expect(err).ToNot(HaveOccurred())
67+
image := fmt.Sprintf("%s/my-alpine", ep.Address())
68+
podmanTest.PodmanExitCleanly("push", "-q", "--tls-verify=false", "--remove-signatures", ALPINE, image)
69+
return image
70+
}
71+
4672
It("podman search", func() {
4773
registryAddress, srv, serverErr := CreateMockRegistryServer()
4874
defer CloseMockRegistryServer(srv, serverErr)
4975

50-
search := podmanTest.Podman([]string{"search", "--tls-verify=false", registryAddress + "/alpine"})
51-
search.WaitWithDefaultTimeout()
52-
Expect(search).Should(ExitCleanly())
76+
search := podmanTest.PodmanExitCleanly("search", "--tls-verify=false", registryAddress+"/alpine")
5377
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 1))
5478
Expect(search.OutputToString()).To(ContainSubstring("alpine"))
5579
})
@@ -58,19 +82,15 @@ registries = []`
5882
registryAddress, srv, serverErr := CreateMockRegistryServer()
5983
defer CloseMockRegistryServer(srv, serverErr)
6084

61-
search := podmanTest.Podman([]string{"search", "--tls-verify=false", registryAddress + "/skopeo/stable:latest"})
62-
search.WaitWithDefaultTimeout()
63-
Expect(search).Should(ExitCleanly())
85+
search := podmanTest.PodmanExitCleanly("search", "--tls-verify=false", registryAddress+"/skopeo/stable:latest")
6486
Expect(search.OutputToString()).To(ContainSubstring(registryAddress + "/skopeo/stable"))
6587
})
6688

6789
It("podman search image with description", func() {
6890
registryAddress, srv, serverErr := CreateMockRegistryServer()
6991
defer CloseMockRegistryServer(srv, serverErr)
7092

71-
search := podmanTest.Podman([]string{"search", "--tls-verify=false", registryAddress + "/podman/stable"})
72-
search.WaitWithDefaultTimeout()
73-
Expect(search).Should(ExitCleanly())
93+
search := podmanTest.PodmanExitCleanly("search", "--tls-verify=false", registryAddress+"/podman/stable")
7494
output := string(search.Out.Contents())
7595
Expect(output).To(MatchRegexp(`(?m)NAME\s+DESCRIPTION$`))
7696
Expect(output).To(MatchRegexp(`(?m)/podman/stable\s+.*Podman Image`))
@@ -80,9 +100,7 @@ registries = []`
80100
registryAddress, srv, serverErr := CreateMockRegistryServer()
81101
defer CloseMockRegistryServer(srv, serverErr)
82102

83-
search := podmanTest.Podman([]string{"search", "--compatible", "--tls-verify=false", registryAddress + "/podman/stable"})
84-
search.WaitWithDefaultTimeout()
85-
Expect(search).Should(ExitCleanly())
103+
search := podmanTest.PodmanExitCleanly("search", "--compatible", "--tls-verify=false", registryAddress+"/podman/stable")
86104
output := string(search.Out.Contents())
87105
Expect(output).To(MatchRegexp(`(?m)NAME\s+DESCRIPTION\s+STARS\s+OFFICIAL\s+AUTOMATED$`))
88106
})
@@ -91,9 +109,7 @@ registries = []`
91109
registryAddress, srv, serverErr := CreateMockRegistryServer()
92110
defer CloseMockRegistryServer(srv, serverErr)
93111

94-
search := podmanTest.Podman([]string{"search", "--format", "table {{.Index}} {{.Name}}", "--tls-verify=false", registryAddress + "/testdigest_v2s2"})
95-
search.WaitWithDefaultTimeout()
96-
Expect(search).Should(ExitCleanly())
112+
search := podmanTest.PodmanExitCleanly("search", "--format", "table {{.Index}} {{.Name}}", "--tls-verify=false", registryAddress+"/testdigest_v2s2")
97113
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 1))
98114
Expect(search.OutputToString()).To(ContainSubstring(registryAddress + "/libpod/testdigest_v2s2"))
99115
})
@@ -102,9 +118,7 @@ registries = []`
102118
registryAddress, srv, serverErr := CreateMockRegistryServer()
103119
defer CloseMockRegistryServer(srv, serverErr)
104120

105-
search := podmanTest.Podman([]string{"search", "--format", "json", "--tls-verify=false", registryAddress + "/testdigest_v2s1"})
106-
search.WaitWithDefaultTimeout()
107-
Expect(search).Should(ExitCleanly())
121+
search := podmanTest.PodmanExitCleanly("search", "--format", "json", "--tls-verify=false", registryAddress+"/testdigest_v2s1")
108122
Expect(search.OutputToString()).To(BeValidJSON())
109123
Expect(search.OutputToString()).To(ContainSubstring(registryAddress + "/libpod/testdigest_v2s1"))
110124
Expect(search.OutputToString()).To(ContainSubstring("Test image used by buildah regression tests"))
@@ -123,9 +137,7 @@ registries = []`
123137
registryAddress, srv, serverErr := CreateMockRegistryServer()
124138
defer CloseMockRegistryServer(srv, serverErr)
125139

126-
search := podmanTest.Podman([]string{"search", "--list-tags", "--format", "json", "--tls-verify=false", registryAddress + "/libpod/alpine:latest"})
127-
search.WaitWithDefaultTimeout()
128-
Expect(search).Should(ExitCleanly())
140+
search := podmanTest.PodmanExitCleanly("search", "--list-tags", "--format", "json", "--tls-verify=false", registryAddress+"/libpod/alpine:latest")
129141
Expect(search.OutputToString()).To(BeValidJSON())
130142
Expect(search.OutputToString()).To(ContainSubstring(registryAddress + "/libpod/alpine"))
131143
Expect(search.OutputToString()).To(ContainSubstring("3.10.2"))
@@ -137,9 +149,7 @@ registries = []`
137149
registryAddress, srv, serverErr := CreateMockRegistryServer()
138150
defer CloseMockRegistryServer(srv, serverErr)
139151

140-
search := podmanTest.Podman([]string{"search", "--no-trunc=false", "--tls-verify=false", registryAddress + "/alpine", "--format={{.Description}}"})
141-
search.WaitWithDefaultTimeout()
142-
Expect(search).Should(ExitCleanly())
152+
search := podmanTest.PodmanExitCleanly("search", "--no-trunc=false", "--tls-verify=false", registryAddress+"/alpine", "--format={{.Description}}")
143153

144154
for _, line := range search.OutputToStringArray() {
145155
if len(line) > 44 {
@@ -152,29 +162,23 @@ registries = []`
152162
registryAddress, srv, serverErr := CreateMockRegistryServer()
153163
defer CloseMockRegistryServer(srv, serverErr)
154164

155-
search := podmanTest.Podman([]string{"search", "--tls-verify=false", registryAddress + "/alpine"})
156-
search.WaitWithDefaultTimeout()
157-
Expect(search).Should(ExitCleanly())
165+
search := podmanTest.PodmanExitCleanly("search", "--tls-verify=false", registryAddress+"/alpine")
158166
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 10))
159167

160-
search = podmanTest.Podman([]string{"search", "--limit", "3", "--tls-verify=false", registryAddress + "/alpine"})
168+
search = podmanTest.PodmanExitCleanly("search", "--limit", "3", "--tls-verify=false", registryAddress+"/alpine")
161169
search.WaitWithDefaultTimeout()
162170
Expect(search).Should(ExitCleanly())
163171
Expect(search.OutputToStringArray()).To(HaveLen(4))
164172

165-
search = podmanTest.Podman([]string{"search", "--limit", "10", "--tls-verify=false", registryAddress + "/alpine"})
166-
search.WaitWithDefaultTimeout()
167-
Expect(search).Should(ExitCleanly())
173+
search = podmanTest.PodmanExitCleanly("search", "--limit", "10", "--tls-verify=false", registryAddress+"/alpine")
168174
Expect(search.OutputToStringArray()).To(HaveLen(11))
169175
})
170176

171177
It("podman search with filter stars", func() {
172178
registryAddress, srv, serverErr := CreateMockRegistryServer()
173179
defer CloseMockRegistryServer(srv, serverErr)
174180

175-
search := podmanTest.Podman([]string{"search", "--filter", "stars=10", "--format", "{{.Stars}}", "--tls-verify=false", registryAddress + "/alpine"})
176-
search.WaitWithDefaultTimeout()
177-
Expect(search).Should(ExitCleanly())
181+
search := podmanTest.PodmanExitCleanly("search", "--filter", "stars=10", "--format", "{{.Stars}}", "--tls-verify=false", registryAddress+"/alpine")
178182
output := search.OutputToStringArray()
179183
for i := range output {
180184
Expect(strconv.Atoi(output[i])).To(BeNumerically(">=", 10))
@@ -185,9 +189,7 @@ registries = []`
185189
registryAddress, srv, serverErr := CreateMockRegistryServer()
186190
defer CloseMockRegistryServer(srv, serverErr)
187191

188-
search := podmanTest.Podman([]string{"search", "--filter", "is-official", "--format", "{{.Official}}", "--tls-verify=false", registryAddress + "/alpine"})
189-
search.WaitWithDefaultTimeout()
190-
Expect(search).Should(ExitCleanly())
192+
search := podmanTest.PodmanExitCleanly("search", "--filter", "is-official", "--format", "{{.Official}}", "--tls-verify=false", registryAddress+"/alpine")
191193
output := search.OutputToStringArray()
192194
for i := range output {
193195
Expect(output[i]).To(Equal("[OK]"))
@@ -198,9 +200,7 @@ registries = []`
198200
registryAddress, srv, serverErr := CreateMockRegistryServer()
199201
defer CloseMockRegistryServer(srv, serverErr)
200202

201-
search := podmanTest.Podman([]string{"search", "--filter", "is-automated=false", "--format", "{{.Automated}}", "--tls-verify=false", registryAddress + "/alpine"})
202-
search.WaitWithDefaultTimeout()
203-
Expect(search).Should(ExitCleanly())
203+
search := podmanTest.PodmanExitCleanly("search", "--filter", "is-automated=false", "--format", "{{.Automated}}", "--tls-verify=false", registryAddress+"/alpine")
204204
output := search.OutputToStringArray()
205205
for i := range output {
206206
Expect(output[i]).To(Equal(""))
@@ -211,94 +211,36 @@ registries = []`
211211
registryAddress, srv, serverErr := CreateMockRegistryServer()
212212
defer CloseMockRegistryServer(srv, serverErr)
213213

214-
search := podmanTest.Podman([]string{"search", "--list-tags", "--format", "{{.Name}}", "--limit", "1", "--tls-verify=false", registryAddress + "/libpod/alpine"})
215-
search.WaitWithDefaultTimeout()
216-
Expect(search).Should(ExitCleanly())
214+
search := podmanTest.PodmanExitCleanly("search", "--list-tags", "--format", "{{.Name}}", "--limit", "1", "--tls-verify=false", registryAddress+"/libpod/alpine")
217215
Expect(search.OutputToString()).To(Equal(registryAddress + "/libpod/alpine"))
218216
})
219217

220218
It("podman search attempts HTTP if tls-verify flag is set false", func() {
221-
if podmanTest.Host.Arch == "ppc64le" {
222-
Skip("No registry image for ppc64le")
223-
}
224-
port := GetPort()
225-
fakereg := podmanTest.Podman([]string{"run", "-d", "--name", "registry",
226-
"-p", fmt.Sprintf("%d:5000", port),
227-
REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"})
228-
fakereg.WaitWithDefaultTimeout()
229-
Expect(fakereg).Should(ExitCleanly())
230-
231-
if !WaitContainerReady(podmanTest, "registry", "listening on", 20, 1) {
232-
Fail("Cannot start docker registry on port %s", port)
233-
}
234-
ep := endpoint{Port: strconv.Itoa(port), Host: "localhost"}
235-
search := podmanTest.Podman([]string{"search",
236-
fmt.Sprintf("%s/fake/image:andtag", ep.Address()), "--tls-verify=false"})
237-
search.WaitWithDefaultTimeout()
238-
219+
ep := mockFakeRegistryServerAsContainer("registry")
239220
// if this test succeeded, there will be no output (there is no entry named fake/image:andtag in an empty registry)
240221
// and the exit code will be 0
241-
Expect(search).Should(ExitCleanly())
222+
search := podmanTest.PodmanExitCleanly("search", fmt.Sprintf("%s/fake/image:andtag", ep.Address()), "--tls-verify=false")
242223
Expect(search.OutputToString()).Should(BeEmpty())
243224
})
244225

245226
It("podman search in local registry", func() {
246-
if podmanTest.Host.Arch == "ppc64le" {
247-
Skip("No registry image for ppc64le")
248-
}
249-
port := GetPort()
250-
registry := podmanTest.Podman([]string{"run", "-d", "--name", "registry3",
251-
"-p", fmt.Sprintf("%d:5000", port), REGISTRY_IMAGE,
252-
"/entrypoint.sh", "/etc/docker/registry/config.yml"})
253-
registry.WaitWithDefaultTimeout()
254-
Expect(registry).Should(ExitCleanly())
227+
ep := mockFakeRegistryServerAsContainer("registry3")
255228

256-
if !WaitContainerReady(podmanTest, "registry3", "listening on", 20, 1) {
257-
Fail("Cannot start docker registry on port %s", port)
258-
}
259-
ep := endpoint{Port: strconv.Itoa(port), Host: "localhost"}
260-
err = podmanTest.RestoreArtifact(ALPINE)
261-
Expect(err).ToNot(HaveOccurred())
262-
image := fmt.Sprintf("%s/my-alpine", ep.Address())
263-
push := podmanTest.Podman([]string{"push", "-q", "--tls-verify=false", "--remove-signatures", ALPINE, image})
264-
push.WaitWithDefaultTimeout()
265-
Expect(push).Should(ExitCleanly())
266-
search := podmanTest.Podman([]string{"search", image, "--tls-verify=false"})
267-
search.WaitWithDefaultTimeout()
229+
image := pushAlpineImageIntoMockRegistry(ep)
268230

269-
Expect(search).Should(ExitCleanly())
231+
search := podmanTest.PodmanExitCleanly("search", image, "--tls-verify=false")
270232
Expect(search.OutputToString()).ShouldNot(BeEmpty())
271233

272234
// podman search v2 registry with empty query
273-
searchEmpty := podmanTest.Podman([]string{"search", fmt.Sprintf("%s/", ep.Address()), "--tls-verify=false"})
274-
searchEmpty.WaitWithDefaultTimeout()
275-
Expect(searchEmpty).Should(ExitCleanly())
235+
searchEmpty := podmanTest.PodmanExitCleanly("search", fmt.Sprintf("%s/", ep.Address()), "--tls-verify=false")
276236
Expect(searchEmpty.OutputToStringArray()).ToNot(BeEmpty())
277237
Expect(search.OutputToString()).To(ContainSubstring("my-alpine"))
278238
})
279239

280240
It("podman search attempts HTTP if registry is in registries.insecure and force secure is false", func() {
281-
if podmanTest.Host.Arch == "ppc64le" {
282-
Skip("No registry image for ppc64le")
283-
}
284-
285-
port := GetPort()
286-
ep := endpoint{Port: strconv.Itoa(port), Host: "localhost"}
287-
registry := podmanTest.Podman([]string{"run", "-d", "-p", fmt.Sprintf("%d:5000", port),
288-
"--name", "registry4", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"})
289-
registry.WaitWithDefaultTimeout()
290-
Expect(registry).Should(ExitCleanly())
241+
ep := mockFakeRegistryServerAsContainer("registry4")
291242

292-
if !WaitContainerReady(podmanTest, "registry4", "listening on", 20, 1) {
293-
Fail("unable to start registry on port %s", port)
294-
}
295-
296-
err = podmanTest.RestoreArtifact(ALPINE)
297-
Expect(err).ToNot(HaveOccurred())
298-
image := fmt.Sprintf("%s/my-alpine", ep.Address())
299-
push := podmanTest.Podman([]string{"push", "-q", "--tls-verify=false", "--remove-signatures", ALPINE, image})
300-
push.WaitWithDefaultTimeout()
301-
Expect(push).Should(ExitCleanly())
243+
image := pushAlpineImageIntoMockRegistry(ep)
302244

303245
// registries.conf set up
304246
var buffer bytes.Buffer
@@ -312,37 +254,20 @@ registries = []`
312254
defer podmanTest.RestartRemoteService()
313255
}
314256

315-
search := podmanTest.Podman([]string{"search", image})
316-
search.WaitWithDefaultTimeout()
317-
318-
Expect(search).Should(ExitCleanly())
257+
search := podmanTest.PodmanExitCleanly("search", image)
319258
Expect(search.OutputToString()).To(ContainSubstring("my-alpine"))
320259

321260
// cleanup
322261
resetRegistriesConfigEnv()
323262
})
324263

325264
It("podman search doesn't attempt HTTP if force secure is true", func() {
326-
if podmanTest.Host.Arch == "ppc64le" {
327-
Skip("No registry image for ppc64le")
328-
}
329-
port := GetPort()
330-
ep := endpoint{Port: strconv.Itoa(port), Host: "localhost"}
331-
registry := podmanTest.Podman([]string{"run", "-d", "-p", fmt.Sprintf("%d:5000", port),
332-
"--name", "registry5", REGISTRY_IMAGE})
333-
registry.WaitWithDefaultTimeout()
334-
Expect(registry).Should(ExitCleanly())
265+
ep := mockFakeRegistryServerAsContainer("registry5")
335266

336-
if !WaitContainerReady(podmanTest, "registry5", "listening on", 20, 1) {
337-
Fail("Cannot start docker registry on port %s", port)
338-
}
339-
340-
err = podmanTest.RestoreArtifact(ALPINE)
267+
port, err := strconv.ParseInt(ep.Port, 10, 64)
341268
Expect(err).ToNot(HaveOccurred())
342-
image := fmt.Sprintf("%s/my-alpine", ep.Address())
343-
push := podmanTest.Podman([]string{"push", "-q", "--tls-verify=false", "--remove-signatures", ALPINE, image})
344-
push.WaitWithDefaultTimeout()
345-
Expect(push).Should(ExitCleanly())
269+
270+
image := pushAlpineImageIntoMockRegistry(ep)
346271

347272
var buffer bytes.Buffer
348273
err = registryFileTmpl.Execute(&buffer, ep)
@@ -362,26 +287,12 @@ registries = []`
362287
})
363288

364289
It("podman search doesn't attempt HTTP if registry is not listed as insecure", func() {
365-
if podmanTest.Host.Arch == "ppc64le" {
366-
Skip("No registry image for ppc64le")
367-
}
368-
port := GetPort()
369-
ep := endpoint{Port: strconv.Itoa(port), Host: "localhost"}
370-
registry := podmanTest.Podman([]string{"run", "-d", "-p", fmt.Sprintf("%d:5000", port),
371-
"--name", "registry6", REGISTRY_IMAGE})
372-
registry.WaitWithDefaultTimeout()
373-
Expect(registry).Should(ExitCleanly())
290+
ep := mockFakeRegistryServerAsContainer("registry6")
374291

375-
if !WaitContainerReady(podmanTest, "registry6", "listening on", 20, 1) {
376-
Fail("Cannot start docker registry on port %s", port)
377-
}
378-
379-
err = podmanTest.RestoreArtifact(ALPINE)
292+
port, err := strconv.ParseInt(ep.Port, 10, 64)
380293
Expect(err).ToNot(HaveOccurred())
381-
image := fmt.Sprintf("%s/my-alpine", ep.Address())
382-
push := podmanTest.Podman([]string{"push", "-q", "--tls-verify=false", "--remove-signatures", ALPINE, image})
383-
push.WaitWithDefaultTimeout()
384-
Expect(push).Should(ExitCleanly())
294+
295+
image := pushAlpineImageIntoMockRegistry(ep)
385296

386297
var buffer bytes.Buffer
387298
err = registryFileBadTmpl.Execute(&buffer, ep)
@@ -416,9 +327,7 @@ registries = []`
416327
registryAddress, srv, serverErr := CreateMockRegistryServer()
417328
defer CloseMockRegistryServer(srv, serverErr)
418329

419-
search := podmanTest.Podman([]string{"search", "--tls-verify=false", registryAddress + "/*alpine*"})
420-
search.WaitWithDefaultTimeout()
421-
Expect(search).Should(ExitCleanly())
330+
search := podmanTest.PodmanExitCleanly("search", "--tls-verify=false", registryAddress+"/*alpine*")
422331
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 1))
423332
Expect(search.OutputToString()).To(ContainSubstring("alpine"))
424333
})
@@ -427,14 +336,10 @@ registries = []`
427336
registryAddress, srv, serverErr := CreateMockRegistryServer()
428337
defer CloseMockRegistryServer(srv, serverErr)
429338

430-
search := podmanTest.Podman([]string{"search", "--list-tags", "--limit", "30", "--tls-verify=false", registryAddress + "/podman/stable"})
431-
search.WaitWithDefaultTimeout()
432-
Expect(search).Should(ExitCleanly())
339+
search := podmanTest.PodmanExitCleanly("search", "--list-tags", "--limit", "30", "--tls-verify=false", registryAddress+"/podman/stable")
433340
Expect(search.OutputToStringArray()).To(HaveLen(31))
434341

435-
search = podmanTest.Podman([]string{"search", "--list-tags", "--tls-verify=false", registryAddress + "/podman/stable"})
436-
search.WaitWithDefaultTimeout()
437-
Expect(search).Should(ExitCleanly())
342+
search = podmanTest.PodmanExitCleanly("search", "--list-tags", "--tls-verify=false", registryAddress+"/podman/stable")
438343
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 2))
439344

440345
search = podmanTest.Podman([]string{"search", "--filter=is-official", "--list-tags", "--tls-verify=false", registryAddress + "/podman/stable"})
@@ -458,9 +363,7 @@ registries = []`
458363
registryAddress, srv, serverErr := CreateMockRegistryServer()
459364
defer CloseMockRegistryServer(srv, serverErr)
460365

461-
search := podmanTest.Podman([]string{"search", "--limit", "100", "--tls-verify=false", registryAddress + "/podman"})
462-
search.WaitWithDefaultTimeout()
463-
Expect(search).Should(ExitCleanly())
366+
search := podmanTest.PodmanExitCleanly("search", "--limit", "100", "--tls-verify=false", registryAddress+"/podman")
464367
Expect(len(search.OutputToStringArray())).To(BeNumerically("<=", 101))
465368
})
466369
})

0 commit comments

Comments
 (0)