File tree Expand file tree Collapse file tree 4 files changed +2
-17
lines changed Expand file tree Collapse file tree 4 files changed +2
-17
lines changed Original file line number Diff line number Diff line change @@ -51,16 +51,12 @@ func hostInfo() map[string]any {
5151 info ["cpus" ] = runtime .NumCPU ()
5252 info ["rootless" ] = unshare .IsRootless ()
5353
54- unified , err := cgroups .IsCgroup2UnifiedMode ()
54+ _ , err := cgroups .IsCgroup2UnifiedMode ()
5555 if err != nil {
5656 logrus .Error (err , "err reading cgroups mode" )
5757 }
58- cgroupVersion := "v1"
5958 ociruntime := util .Runtime ()
60- if unified {
61- cgroupVersion = "v2"
62- }
63- info ["CgroupVersion" ] = cgroupVersion
59+ info ["CgroupVersion" ] = "v2"
6460 info ["OCIRuntime" ] = ociruntime
6561
6662 mi , err := system .ReadMemInfo ()
Original file line number Diff line number Diff line change @@ -700,15 +700,6 @@ function skip_if_cgroupsv2() {
700700 fi
701701}
702702
703- # ######################
704- # skip_if_cgroupsv1 # Some tests don't work with cgroupsv1
705- # ######################
706- function skip_if_cgroupsv1() {
707- if ! is_cgroupsv2; then
708- skip " ${1:- test does not work with cgroups v1} "
709- fi
710- }
711-
712703# #########################
713704# skip_if_in_container #
714705# #########################
Original file line number Diff line number Diff line change 947947
948948@test " rootless on cgroupv2 and systemd runs under user.slice" {
949949 skip_if_no_runtime
950- skip_if_cgroupsv1
951950 skip_if_in_container
952951 skip_if_root_environment
953952 if test " $DBUS_SESSION_BUS_ADDRESS " = " " ; then
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ load helpers
55@test " tutorial-cgroups" {
66 # confidence check for the sake of packages that consume our library
77 skip_if_no_runtime
8- skip_if_cgroupsv1
98 skip_if_rootless_environment
109 skip_if_chroot
1110
You can’t perform that action at this time.
0 commit comments