summaryrefslogtreecommitdiff
path: root/test/system/005-info.bats
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-09-23 15:16:11 -0600
committerEd Santiago <santiago@redhat.com>2020-09-23 16:38:05 -0600
commite62848752561640ecad72901938d0c0c5c17ed9a (patch)
tree1499488ad50ee978d587b9096c5eccf63f642a64 /test/system/005-info.bats
parenta6b300ef7ee19da0c590af9bbcd1a35de7fa8c84 (diff)
downloadpodman-e62848752561640ecad72901938d0c0c5c17ed9a.tar.gz
podman-e62848752561640ecad72901938d0c0c5c17ed9a.tar.bz2
podman-e62848752561640ecad72901938d0c0c5c17ed9a.zip
system tests: helpers: safer parse_table
The parse_table() helper has until now dumbly split lines on every single '|' character. This prevents us from running simple tests such as 'cgroupManager: (systemd|cgroupfs)'. We now use an ugly but robust sed expression to split on '|' but *only* when surrounded by spaces and/or beginning or end of line. This is safe because, for readability, all tables already keep the '|' symbols well separated from table content. Add tests. And, the whole reason behind this, add an actual real test for cgroupManager and cgroupVersion. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/005-info.bats')
-rw-r--r--test/system/005-info.bats6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/system/005-info.bats b/test/system/005-info.bats
index ef3e97af0..7452c1901 100644
--- a/test/system/005-info.bats
+++ b/test/system/005-info.bats
@@ -19,8 +19,8 @@ graphRoot:
graphStatus:
imageStore:\\\s\\\+number: 1
runRoot:
-cgroupManager:
-cgroupVersion: v
+cgroupManager: \\\(systemd\\\|cgroupfs\\\)
+cgroupVersion: v[12]
"
while read expect; do
is "$output" ".*$expect" "output includes '$expect'"
@@ -36,6 +36,8 @@ cgroupVersion: v
tests="
host.buildahVersion | [0-9.]
host.conmon.path | $expr_path
+host.cgroupManager | \\\(systemd\\\|cgroupfs\\\)
+host.cgroupVersion | v[12]
host.ociRuntime.path | $expr_path
store.configFile | $expr_path
store.graphDriverName | [a-z0-9]\\\+\\\$