D50661.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50661.id.diff
View Options

	diff --git a/tests/atf_python/utils.py b/tests/atf_python/utils.py
	--- a/tests/atf_python/utils.py
	+++ b/tests/atf_python/utils.py
	@@ -46,6 +46,7 @@
	NEED_ROOT: bool = False # True if the class needs root privileges for the setup
	TARGET_USER = None # Set to the target user by the framework
	REQUIRED_MODULES: List[str] = []
	+ SKIP_MODULES: List[str] = []

	def require_module(self, mod_name: str, skip=True):
	error_code = libc.modfind(mod_name)
	@@ -58,9 +59,18 @@
	else:
	raise ValueError(txt)

	+ def skip_module(self, mod_name: str):
	+ error_code = libc.modfind(mod_name)
	+ if error_code == 0:
	+ txt = "kernel module '{}' loaded, skip test".format(mod_name)
	+ pytest.skip(txt)
	+ return
	+
	def _check_modules(self):
	for mod_name in self.REQUIRED_MODULES:
	self.require_module(mod_name)
	+ for mod_name in self.SKIP_MODULES:
	+ self.skip_module(mod_name)

	@property
	def atf_vars(self) -> Dict[str, str]:
	diff --git a/tests/sys/netpfil/pf/header.py b/tests/sys/netpfil/pf/header.py
	--- a/tests/sys/netpfil/pf/header.py
	+++ b/tests/sys/netpfil/pf/header.py
	@@ -125,6 +125,7 @@

	class TestHeader6(VnetTestTemplate):
	REQUIRED_MODULES = [ "pf" ]
	+ SKIP_MODULES = [ "ipfilter" ]
	TOPOLOGY = {
	"vnet1": {"ifaces": ["if1", "if2"]},
	"vnet2": {"ifaces": ["if1", "if2"]},