summaryrefslogtreecommitdiff
path: root/test/apiv2/01-basic.at
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-02 23:41:12 +0100
committerGitHub <noreply@github.com>2020-03-02 23:41:12 +0100
commitc5dfd83cf4528e58f5928ac1ef1f2b00fd5ca559 (patch)
treeb9ca20ae31bb4f884ae7818a08004b5af55dced4 /test/apiv2/01-basic.at
parent47c4ea39196cedac87e7a4e4c1ead54ed9d7ed50 (diff)
parent56120894125b0859a81af2f96062157465b56e87 (diff)
downloadpodman-c5dfd83cf4528e58f5928ac1ef1f2b00fd5ca559.tar.gz
podman-c5dfd83cf4528e58f5928ac1ef1f2b00fd5ca559.tar.bz2
podman-c5dfd83cf4528e58f5928ac1ef1f2b00fd5ca559.zip
Merge pull request #5333 from edsantiago/test_apiv2
CI: add API v2 tests
Diffstat (limited to 'test/apiv2/01-basic.at')
-rw-r--r--test/apiv2/01-basic.at12
1 files changed, 9 insertions, 3 deletions
diff --git a/test/apiv2/01-basic.at b/test/apiv2/01-basic.at
index b8a049cdf..0e94ddb7a 100644
--- a/test/apiv2/01-basic.at
+++ b/test/apiv2/01-basic.at
@@ -41,10 +41,16 @@ t GET libpod/containers/create 405
#
# system info
#
+# Some day perhaps it will always be runc; for now, cgroupsv2 requires crun
+#
# FIXME: run 'podman info --format=json', and compare select fields
-t GET info 200 \
- .OSType=linux \
- .DefaultRuntime=runc \
+runtime=runc
+if have_cgroupsv2; then
+ runtime=crun
+fi
+t GET info 200 \
+ .OSType=linux \
+ .DefaultRuntime~.*$runtime \
.MemTotal~[0-9]\\+
# Timing: make sure server stays responsive