Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo in tests #8542

Merged
merged 1 commit into from
Dec 1, 2020
+32 −32
Merged

Fix typo in tests #8542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/e2e/containers_conf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,35 +203,35 @@ var _ = Describe("Podman run", func() {
session := podmanTest.Podman([]string{"run", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("search foobar.com")
session.LineInOutputStartsWith("search foobar.com")
})

It("podman run add dns server", func() {
session := podmanTest.Podman([]string{"run", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("server 1.2.3.4")
session.LineInOutputStartsWith("server 1.2.3.4")
})

It("podman run add dns option", func() {
session := podmanTest.Podman([]string{"run", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("options debug")
session.LineInOutputStartsWith("options debug")
})

It("podman run containers.conf remove all search domain", func() {
session := podmanTest.Podman([]string{"run", "--dns-search=.", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("search")).To(BeFalse())
Expect(session.LineInOutputStartsWith("search")).To(BeFalse())
})

It("podman run use containers.conf search domain", func() {
session := podmanTest.Podman([]string{"run", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("search")).To(BeTrue())
Expect(session.LineInOutputStartsWith("search")).To(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("foobar.com"))

Expect(session.OutputToString()).To(ContainSubstring("1.2.3.4"))
Expand Down Expand Up @@ -275,7 +275,7 @@ var _ = Describe("Podman run", func() {
session = podmanTest.Podman([]string{"run", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("search")).To(BeTrue())
Expect(session.LineInOutputStartsWith("search")).To(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("foobar.com"))
Expect(session.OutputToString()).To(ContainSubstring("1.2.3.4"))
Expect(session.OutputToString()).To(ContainSubstring("debug"))
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ var _ = Describe("Podman images", func() {
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
Expect(session.LineInOuputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
Expect(session.LineInOuputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
Expect(session.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
Expect(session.LineInOutputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
})

It("podman image List", func() {
session := podmanTest.Podman([]string{"image", "list"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
Expect(session.LineInOuputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
Expect(session.LineInOuputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
Expect(session.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
Expect(session.LineInOutputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
})

It("podman images with multiple tags", func() {
Expand Down Expand Up @@ -86,8 +86,8 @@ var _ = Describe("Podman images", func() {
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
Expect(session.LineInOuputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
Expect(session.LineInOuputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
Expect(session.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
Expect(session.LineInOutputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
})

It("podman empty images list in JSON format", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/import_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ var _ = Describe("Podman import", func() {
results := podmanTest.Podman([]string{"history", "imported-image", "--format", "{{.Comment}}"})
results.WaitWithDefaultTimeout()
Expect(results.ExitCode()).To(Equal(0))
Expect(results.LineInOuputStartsWith("importing container test message")).To(BeTrue())
Expect(results.LineInOutputStartsWith("importing container test message")).To(BeTrue())
})

It("podman import with change flag CMD=<path>", func() {
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/port_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var _ = Describe("Podman port", func() {
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
port := strings.Split(result.OutputToStringArray()[0], ":")[1]
Expect(result.LineInOuputStartsWith(fmt.Sprintf("80/tcp -> 0.0.0.0:%s", port))).To(BeTrue())
Expect(result.LineInOutputStartsWith(fmt.Sprintf("80/tcp -> 0.0.0.0:%s", port))).To(BeTrue())
})

It("podman container port -l nginx", func() {
Expand All @@ -79,7 +79,7 @@ var _ = Describe("Podman port", func() {
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
port := strings.Split(result.OutputToStringArray()[0], ":")[1]
Expect(result.LineInOuputStartsWith(fmt.Sprintf("80/tcp -> 0.0.0.0:%s", port))).To(BeTrue())
Expect(result.LineInOutputStartsWith(fmt.Sprintf("80/tcp -> 0.0.0.0:%s", port))).To(BeTrue())
})

It("podman port -l port nginx", func() {
Expand All @@ -97,7 +97,7 @@ var _ = Describe("Podman port", func() {
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
port := strings.Split(result.OutputToStringArray()[0], ":")[1]
Expect(result.LineInOuputStartsWith(fmt.Sprintf("0.0.0.0:%s", port))).To(BeTrue())
Expect(result.LineInOutputStartsWith(fmt.Sprintf("0.0.0.0:%s", port))).To(BeTrue())
})

It("podman port -a nginx", func() {
Expand All @@ -124,7 +124,7 @@ var _ = Describe("Podman port", func() {
result := podmanTest.Podman([]string{"port", "portcheck"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
result.LineInOuputStartsWith("80/tcp -> 0.0.0.0:")
result.LineInOutputStartsWith("80/tcp -> 0.0.0.0:")
})

It("podman port multiple ports", func() {
Expand All @@ -142,12 +142,12 @@ var _ = Describe("Podman port", func() {
result1 := podmanTest.Podman([]string{"port", "test", "5000"})
result1.WaitWithDefaultTimeout()
Expect(result1.ExitCode()).To(BeZero())
Expect(result1.LineInOuputStartsWith("0.0.0.0:5000")).To(BeTrue())
Expect(result1.LineInOutputStartsWith("0.0.0.0:5000")).To(BeTrue())

// Check that the second port was honored
result2 := podmanTest.Podman([]string{"port", "test", "5001"})
result2.WaitWithDefaultTimeout()
Expect(result2.ExitCode()).To(BeZero())
Expect(result2.LineInOuputStartsWith("0.0.0.0:5001")).To(BeTrue())
Expect(result2.LineInOutputStartsWith("0.0.0.0:5001")).To(BeTrue())
})
})
2 changes: 1 addition & 1 deletion test/e2e/pull_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ var _ = Describe("Podman pull", func() {
session := podmanTest.Podman([]string{"pull", "--all-tags", "k8s.gcr.io/pause"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("Pulled Images:")).To(BeTrue())
Expect(session.LineInOutputStartsWith("Pulled Images:")).To(BeTrue())

session = podmanTest.Podman([]string{"images"})
session.WaitWithDefaultTimeout()
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/run_dns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ var _ = Describe("Podman run dns", func() {
session := podmanTest.Podman([]string{"run", "--dns-search=foobar.com", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("search foobar.com")
session.LineInOutputStartsWith("search foobar.com")
})

It("podman run remove all search domain", func() {
session := podmanTest.Podman([]string{"run", "--dns-search=.", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("search")).To(BeFalse())
Expect(session.LineInOutputStartsWith("search")).To(BeFalse())
})

It("podman run add bad dns server", func() {
Expand All @@ -56,14 +56,14 @@ var _ = Describe("Podman run dns", func() {
session := podmanTest.Podman([]string{"run", "--dns=1.2.3.4", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("server 1.2.3.4")
session.LineInOutputStartsWith("server 1.2.3.4")
})

It("podman run add dns option", func() {
session := podmanTest.Podman([]string{"run", "--dns-opt=debug", ALPINE, "cat", "/etc/resolv.conf"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("options debug")
session.LineInOutputStartsWith("options debug")
})

It("podman run add bad host", func() {
Expand All @@ -76,8 +76,8 @@ var _ = Describe("Podman run dns", func() {
session := podmanTest.Podman([]string{"run", "--add-host=foobar:1.1.1.1", "--add-host=foobaz:2001:db8::68", ALPINE, "cat", "/etc/hosts"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("1.1.1.1 foobar")
session.LineInOuputStartsWith("2001:db8::68 foobaz")
session.LineInOutputStartsWith("1.1.1.1 foobar")
session.LineInOutputStartsWith("2001:db8::68 foobaz")
})

It("podman run add hostname", func() {
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/run_entrypoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
session := podmanTest.Podman([]string{"run", "--entrypoint=uname", "foobar.com/entrypoint:latest"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("Linux")).To(BeTrue())
Expect(session.LineInOutputStartsWith("Linux")).To(BeTrue())

session = podmanTest.Podman([]string{"run", "--entrypoint", "", "foobar.com/entrypoint:latest", "uname"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("Linux")).To(BeTrue())
Expect(session.LineInOutputStartsWith("Linux")).To(BeTrue())
})

It("podman run user entrypoint with command overrides image entrypoint and image cmd", func() {
Expand All @@ -116,6 +116,6 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
session := podmanTest.Podman([]string{"run", "--entrypoint=uname", "foobar.com/entrypoint:latest", "-r"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("Linux")).To(BeFalse())
Expect(session.LineInOutputStartsWith("Linux")).To(BeFalse())
})
})
4 changes: 2 additions & 2 deletions test/utils/podmansession_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ var _ = Describe("PodmanSession test", func() {
})

It("Test LineInOutputStartsWith", func() {
Expect(session.LineInOuputStartsWith("Podman")).To(BeTrue())
Expect(session.LineInOuputStartsWith("Session")).To(Not(BeTrue()))
Expect(session.LineInOutputStartsWith("Podman")).To(BeTrue())
Expect(session.LineInOutputStartsWith("Session")).To(Not(BeTrue()))
})

It("Test LineInOutputContains", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func (s *PodmanSession) ErrorGrepString(term string) (bool, []string) {

// LineInOutputStartsWith returns true if a line in a
// session output starts with the supplied string
func (s *PodmanSession) LineInOuputStartsWith(term string) bool {
func (s *PodmanSession) LineInOutputStartsWith(term string) bool {
for _, i := range s.OutputToStringArray() {
if strings.HasPrefix(i, term) {
return true
Expand Down