opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix dns resolution on ubuntu

Browse Source 
ubuntu's dns seems a little odd and requires a fq name in its tests.

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2021-02-15 12:31:09 -06:00
parent 0ab5bfd313
commit 227c548130
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/network_test.go
View File

@ -416,14 +416,26 @@ var _ = Describe("Podman network", func() {
defer podmanTest.removeCNINetwork(netName) defer podmanTest.removeCNINetwork(netName)
Expect(session.ExitCode()).To(BeZero()) Expect(session.ExitCode()).To(BeZero())
interval := time.Duration(250 * time.Millisecond)
for i := 0; i < 6; i++ {
n := podmanTest.Podman([]string{"network", "exists", netName})
n.WaitWithDefaultTimeout()
worked = n.ExitCode() == 0
if worked {
break
}
time.Sleep(interval)
interval *= 2
}
top := podmanTest.Podman([]string{"run", "-dt", "--name=web", "--network=" + netName, "--network-alias=web1", "--network-alias=web2", nginx}) top := podmanTest.Podman([]string{"run", "-dt", "--name=web", "--network=" + netName, "--network-alias=web1", "--network-alias=web2", nginx})
top.WaitWithDefaultTimeout() top.WaitWithDefaultTimeout()
Expect(top.ExitCode()).To(BeZero()) Expect(top.ExitCode()).To(BeZero())
interval := time.Duration(250 * time.Millisecond) interval = time.Duration(250 * time.Millisecond)
// Wait for the nginx service to be running // Wait for the nginx service to be running
for i := 0; i < 6; i++ { for i := 0; i < 6; i++ {
// Test curl against the container's name // Test curl against the container's name
c1 := podmanTest.Podman([]string{"run", "--network=" + netName, nginx, "curl", "web"}) c1 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, nginx, "curl", "web"})
c1.WaitWithDefaultTimeout() c1.WaitWithDefaultTimeout()
worked = c1.ExitCode() == 0 worked = c1.ExitCode() == 0
if worked { if worked {
@ -436,12 +448,12 @@ var _ = Describe("Podman network", func() {
// Nginx is now running so no need to do a loop // Nginx is now running so no need to do a loop
// Test against the first alias // Test against the first alias
c2 := podmanTest.Podman([]string{"run", "--network=" + netName, nginx, "curl", "web1"}) c2 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, nginx, "curl", "web1"})
c2.WaitWithDefaultTimeout() c2.WaitWithDefaultTimeout()
Expect(c2.ExitCode()).To(BeZero()) Expect(c2.ExitCode()).To(BeZero())
// Test against the second alias // Test against the second alias
c3 := podmanTest.Podman([]string{"run", "--network=" + netName, nginx, "curl", "web2"}) c3 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, nginx, "curl", "web2"})
c3.WaitWithDefaultTimeout() c3.WaitWithDefaultTimeout()
Expect(c3.ExitCode()).To(BeZero()) Expect(c3.ExitCode()).To(BeZero())
}) })