summaryrefslogtreecommitdiff
path: root/test/system
diff options
context:
space:
mode:
Diffstat (limited to 'test/system')
-rw-r--r--test/system/005-info.bats2
-rw-r--r--test/system/250-systemd.bats7
-rw-r--r--test/system/500-networking.bats6
3 files changed, 11 insertions, 4 deletions
diff --git a/test/system/005-info.bats b/test/system/005-info.bats
index 0f7e8b2e4..1d84ede9b 100644
--- a/test/system/005-info.bats
+++ b/test/system/005-info.bats
@@ -89,7 +89,7 @@ host.slirp4netns.executable | $expr_path
}
@test "podman info netavark " {
- # Confirm netavark in use when explicitely required by execution environment.
+ # Confirm netavark in use when explicitly required by execution environment.
if [[ "$NETWORK_BACKEND" == "netavark" ]]; then
if ! is_netavark; then
# Assume is_netavark() will provide debugging feedback.
diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats
index 3847d9510..6c72e14e8 100644
--- a/test/system/250-systemd.bats
+++ b/test/system/250-systemd.bats
@@ -281,6 +281,13 @@ LISTEN_FDNAMES=listen_fdnames" | sort)
is "$output" "" "output should be empty"
}
+@test "podman --systemd sets container_uuid" {
+ run_podman run --systemd=always --name test $IMAGE printenv container_uuid
+ container_uuid=$output
+ run_podman inspect test --format '{{ .ID }}'
+ is "${container_uuid}" "${output:0:32}" "UUID should be first 32 chars of Container id"
+}
+
# https://github.com/containers/podman/issues/13153
@test "podman rootless-netns slirp4netns process should be in different cgroup" {
is_rootless || skip "only meaningful for rootless"
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index 4b1a22981..a95561635 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -614,7 +614,7 @@ EOF
"
CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE cat /etc/resolv.conf
- is "$output" "search example.com$nl.*" "correct seach domain"
+ is "$output" "search example.com$nl.*" "correct search domain"
is "$output" ".*nameserver 1.1.1.1${nl}nameserver $searchIP${nl}nameserver 1.0.0.1${nl}nameserver 8.8.8.8" "nameserver order is correct"
# create network with dns
@@ -623,12 +623,12 @@ EOF
run_podman network create --subnet "$subnet.0/24" $netname
# custom server overwrites the network dns server
CONTAINERS_CONF=$containersconf run_podman run --network $netname --rm $IMAGE cat /etc/resolv.conf
- is "$output" "search example.com$nl.*" "correct seach domain"
+ is "$output" "search example.com$nl.*" "correct search domain"
is "$output" ".*nameserver 1.1.1.1${nl}nameserver $searchIP${nl}nameserver 1.0.0.1${nl}nameserver 8.8.8.8" "nameserver order is correct"
# we should use the integrated dns server
run_podman run --network $netname --rm $IMAGE cat /etc/resolv.conf
- is "$output" "search dns.podman.*" "correct seach domain"
+ is "$output" "search dns.podman.*" "correct search domain"
is "$output" ".*nameserver $subnet.1.*" "integrated dns nameserver is set"
}