summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-09-16 17:24:34 +0200
committerGitHub <noreply@github.com>2022-09-16 17:24:34 +0200
commita9a1345cb02db1a34cb248221fb06ff523c1e25c (patch)
tree3f088b2c4582fbe3eb812e7da63b6f551fb04e73 /test
parent4823c1b3f675c0f370b21d14ec437ce55300e97d (diff)
parent21841dc381f252d447a00e2d4ca5082a5e80d0f7 (diff)
downloadpodman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.tar.gz
podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.tar.bz2
podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.zip
Merge pull request #15823 from rhatdan/dns-opt
Default to --dns-option to match Docker and Buildah
Diffstat (limited to 'test')
-rw-r--r--test/e2e/generate_kube_test.go2
-rw-r--r--test/system/200-pod.bats4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index d8308aeea..cd2378bdf 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -912,7 +912,7 @@ var _ = Describe("Podman generate kube", func() {
})
It("podman generate kube on a container with dns options", func() {
- top := podmanTest.Podman([]string{"run", "-dt", "--name", "top", "--dns", "8.8.8.8", "--dns-search", "foobar.com", "--dns-opt", "color:blue", ALPINE, "top"})
+ top := podmanTest.Podman([]string{"run", "-dt", "--name", "top", "--dns", "8.8.8.8", "--dns-search", "foobar.com", "--dns-option", "color:blue", ALPINE, "top"})
top.WaitWithDefaultTimeout()
Expect(top).Should(Exit(0))
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index 9bbd56fef..8ece6e476 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -221,7 +221,7 @@ EOF
--add-host "$add_host_n:$add_host_ip" \
--dns "$dns_server" \
--dns-search "$dns_search" \
- --dns-opt "$dns_opt" \
+ --dns-option "$dns_opt" \
--publish "$port_out:$port_in" \
--label "${labelname}=${labelvalue}" \
--infra-image "$infra_image" \
@@ -262,7 +262,7 @@ EOF
run_podman run --rm --pod mypod $IMAGE cat /etc/resolv.conf
is "$output" ".*nameserver $dns_server" "--dns [server] was added"
is "$output" ".*search $dns_search" "--dns-search was added"
- is "$output" ".*options $dns_opt" "--dns-opt was added"
+ is "$output" ".*options $dns_opt" "--dns-option was added"
# pod inspect
run_podman pod inspect --format '{{.Name}}: {{.ID}} : {{.NumContainers}} : {{.Labels}}' mypod