summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/e2e/containers_conf_test.go6
-rw-r--r--test/e2e/port_test.go2
-rwxr-xr-xtest/e2e/remove-betrue48
-rw-r--r--test/e2e/run_dns_test.go11
-rw-r--r--test/e2e/run_userns_test.go6
5 files changed, 13 insertions, 60 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index 7c3b07714..6a760da17 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -224,21 +224,21 @@ var _ = Describe("Podman run", func() {
session := podmanTest.Podman([]string{"run", 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 add dns server", func() {
session := podmanTest.Podman([]string{"run", 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", 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 containers.conf remove all search domain", func() {
diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go
index b502fa61f..776687113 100644
--- a/test/e2e/port_test.go
+++ b/test/e2e/port_test.go
@@ -125,7 +125,7 @@ var _ = Describe("Podman port", func() {
result := podmanTest.Podman([]string{"port", "portcheck"})
result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0))
- result.LineInOutputStartsWith("80/tcp -> 0.0.0.0:")
+ Expect(result.OutputToStringArray()).To(ContainElement(HavePrefix("80/tcp -> 0.0.0.0:")))
})
It("podman port multiple ports", func() {
diff --git a/test/e2e/remove-betrue b/test/e2e/remove-betrue
deleted file mode 100755
index dd56ca818..000000000
--- a/test/e2e/remove-betrue
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl
-#
-# one-shot script for #12387
-#
-use warnings;
-use strict;
-use File::Basename qw(dirname);
-
-chdir(dirname($0));
-
-for my $f (glob('*_test.go')) {
- my ($indent, $okvar, $sessionvar, $s);
- my $prev = '';
-
- open my $fh_in, '<', $f or die;
- open my $fh_out, '>', "$f.tmp.$$" or die;
- while (<$fh_in>) {
- if (/^(\s+)(\S+),\s+_\s+:?=\s+(\S+)\.GrepString\((.*)\)/) {
- print { $fh_out } $prev;
- $prev = $_;
- ($indent, $okvar, $sessionvar, $s) = ($1, $2, $3, $4);
- next;
- }
- elsif ($okvar && /^\s+Expect\($okvar\)\.(Should|To)\(BeTrue\(\)\)\s*$/) {
- print { $fh_out} $indent, "Expect($sessionvar.OutputToString()).To(ContainSubstring($s))\n";
- $okvar = $sessionvar = $s = $prev = '';
- next;
- }
- else {
- print { $fh_out } $prev;
- $prev = $_;
- $okvar = $sessionvar = $s = '';
-
- # Handle other common cases
- $prev =~ s{
-^ (\s+) Expect\((\S+)\.LineInOutputContains\((.*?)\)\)\.To\(BeTrue\(\)\)
- }{${1}Expect($2.OutputToString()).To(ContainSubstring($3))}xx;
-
- $prev =~ s{
-^ (\s+) Expect\((\S+)\.LineInOutputStartsWith\((.*)\)\)\.To\(BeTrue\(\)\)
- }{${1}Expect($2.OutputToStringArray()).To(ContainElement(HavePrefix($3)))}xx;
-
- }
- }
- print { $fh_out } $prev;
- close $fh_out or die;
- rename "$f.tmp.$$" => "$f" or die;
-}
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() {
diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go
index 0d4b327b9..9b981ef72 100644
--- a/test/e2e/run_userns_test.go
+++ b/test/e2e/run_userns_test.go
@@ -180,17 +180,17 @@ var _ = Describe("Podman UserNS support", func() {
session := podmanTest.Podman([]string{"run", "--userns=auto:size=500", "alpine", "cat", "/proc/self/uid_map"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
- ok, _ := session.GrepString("500")
+ Expect(session.OutputToString()).To(ContainSubstring("500"))
session = podmanTest.Podman([]string{"run", "--userns=auto:size=3000", "alpine", "cat", "/proc/self/uid_map"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
- ok, _ = session.GrepString("3000")
+ Expect(session.OutputToString()).To(ContainSubstring("3000"))
session = podmanTest.Podman([]string{"run", "--userns=auto", "--user=2000:3000", "alpine", "cat", "/proc/self/uid_map"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
- ok, _ = session.GrepString("3001")
+ Expect(session.OutputToString()).To(ContainSubstring("3001"))
session = podmanTest.Podman([]string{"run", "--userns=auto", "--user=4000:1000", "alpine", "cat", "/proc/self/uid_map"})
session.WaitWithDefaultTimeout()
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-06 09:36:54 +0000