summaryrefslogtreecommitdiff
path: root/smoketest
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-01 21:27:01 +0200
committerGitHub <noreply@github.com>2024-05-01 21:27:01 +0200
commitc37bbccf18b82f47bb7211a445b054d3606da3cb (patch)
tree4d74622d2b8f411adef15a2a4fa093a33f69f212 /smoketest
parentf69604da0a06e4bf48e3730286539f84ad02d0ef (diff)
parent387e23e2806a524c3f3b1880fdbdce053e1572ce (diff)
downloadvyos-1x-c37bbccf18b82f47bb7211a445b054d3606da3cb.tar.gz
vyos-1x-c37bbccf18b82f47bb7211a445b054d3606da3cb.zip
Merge pull request #3391 from vyos/mergify/bp/sagitta/pr-3390
smoketest: T6199: remove redundant code when unpacking Kernel GZ config (backport #3390)
Diffstat (limited to 'smoketest')
-rwxr-xr-xsmoketest/scripts/system/test_kernel_options.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/smoketest/scripts/system/test_kernel_options.py b/smoketest/scripts/system/test_kernel_options.py
index a39ae50bc..0e3cbd0ed 100755
--- a/smoketest/scripts/system/test_kernel_options.py
+++ b/smoketest/scripts/system/test_kernel_options.py
@@ -76,7 +76,6 @@ class TestKernelModules(unittest.TestCase):
self.assertTrue(tmp)
def test_qemu_support(self):
- # The bond/lacp interface must be enabled in the OS Kernel
for option in ['CONFIG_VIRTIO_BLK', 'CONFIG_SCSI_VIRTIO',
'CONFIG_VIRTIO_NET', 'CONFIG_VIRTIO_CONSOLE',
'CONFIG_VIRTIO', 'CONFIG_VIRTIO_PCI',
@@ -86,11 +85,14 @@ class TestKernelModules(unittest.TestCase):
self.assertTrue(tmp)
def test_vmware_support(self):
- # The bond/lacp interface must be enabled in the OS Kernel
for option in ['CONFIG_VMXNET3']:
tmp = re.findall(f'{option}=(y|m)', config)
self.assertTrue(tmp)
+ def test_container_cgroup_support(self):
+ for option in ['CONFIG_CGROUPS', 'CONFIG_MEMCG', 'CONFIG_CGROUP_PIDS', 'CONFIG_CGROUP_BPF']:
+ tmp = re.findall(f'{option}=(y|m)', config)
+ self.assertTrue(tmp)
if __name__ == '__main__':
unittest.main(verbosity=2)