diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-11-22 13:28:43 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-11-22 15:23:08 -0700 |
| commit | 49d63ad5c120919ff6669baae2ebbd2b81f5c11a (patch) | |
| tree | 90d0bdcb144a8fb74d75c93fa518b573309cf74f /test/e2e/run_dns_test.go | |
| parent | 97ab9176f77c4fc9c4413afad4d2dcf5fad824b6 (diff) | |
| download | podman-49d63ad5c120919ff6669baae2ebbd2b81f5c11a.tar.gz podman-49d63ad5c120919ff6669baae2ebbd2b81f5c11a.tar.bz2 podman-49d63ad5c120919ff6669baae2ebbd2b81f5c11a.zip | |
Oops! Manual edits to broken tests
Commit 2 of 2: there were (still are?) a bunch of string
checks that didn't have a corresponding Expect(). IIUC
that means they were NOPs. Try to identify and fix those.
The first few were caught by Go linting, "ok is defined
but not used". When I realized the problem, I looked for
more using:
$ ack -A2 LineInOutputStartsWith
...and tediously eyeballing the results, looking for
matches in which the next line was not Expect(). If
test was wrong (e.g. "server" should've been "nameserver"),
fix that.
Also: remove the remove-betrue script. We don't need it
in the repo, I just wanted to preserve it for posterity.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/e2e/run_dns_test.go')
| -rw-r--r-- | test/e2e/run_dns_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 01f40b1fc..beb6390e0 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -37,7 +37,7 @@ var _ = Describe("Podman run dns", func() { session := podmanTest.Podman([]string{"run", "--dns-search=foobar.com", ALPINE, "cat", "/etc/resolv.conf"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - session.LineInOutputStartsWith("search foobar.com") + Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("search foobar.com"))) }) It("podman run remove all search domain", func() { @@ -57,14 +57,15 @@ 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).Should(Exit(0)) - session.LineInOutputStartsWith("server 1.2.3.4") + Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("nameserver 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).Should(Exit(0)) - session.LineInOutputStartsWith("options debug") + Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("options debug"))) }) It("podman run add bad host", func() { @@ -77,8 +78,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).Should(Exit(0)) - session.LineInOutputStartsWith("1.1.1.1 foobar") - session.LineInOutputStartsWith("2001:db8::68 foobaz") + Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("1.1.1.1 foobar"))) + Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("2001:db8::68 foobaz"))) }) It("podman run add hostname", func() { |