Commit dff94bc6 authored Dec 23, 2025 by Paolo Abeni

Merge branch 'selftests-drv-net-psp-fix-templated-test-names-in-psp-py'



Daniel Zahka says:

====================
selftests: drv-net: psp: fix templated test names in psp.py

The templated test names in psp.py had a bug that was not exposed
until 80970e0f ("selftests: net: py: extract the case generation
logic") changed the order of test case evaluation and test case name
extraction.

The test cases created in psp_ip_ver_test_builder() and
ipver_test_builder() were only assigning formatted names to the test
cases they returned, when the test itself was run. This series moves
the test case naming to the point where the test function is created.

Using netdevsim psp:
Before:
./tools/testing/selftests/drivers/net/psp.py
  TAP version 13
  1..28
  ok 1 psp.test_case
  ok 2 psp.test_case
  ok 3 psp.test_case
  ok 4 psp.test_case
  ok 5 psp.test_case
  ok 6 psp.test_case
  ok 7 psp.test_case
  ok 8 psp.test_case
  ok 9 psp.test_case
  ok 10 psp.test_case
  ok 11 psp.dev_list_devices
  ...
  ok 28 psp.removal_device_bi
  # Totals: pass:28 fail:0 xfail:0 xpass:0 skip:0 error:0
  #
  # Responder logs (0):
  # STDERR:
  #  Set PSP enable on device 3 to 0xf
  #  Set PSP enable on device 3 to 0x0

After:
./tools/testing/selftests/drivers/net/psp.py
  TAP version 13
  1..28
  ok 1 psp.data_basic_send_v0_ip4
  ok 2 psp.data_basic_send_v0_ip6
  ok 3 psp.data_basic_send_v1_ip4
  ok 4 psp.data_basic_send_v1_ip6
  ok 5 psp.data_basic_send_v2_ip4
  ok 6 psp.data_basic_send_v2_ip6
  ok 7 psp.data_basic_send_v3_ip4
  ok 8 psp.data_basic_send_v3_ip6
  ok 9 psp.data_mss_adjust_ip4
  ok 10 psp.data_mss_adjust_ip6
  ok 11 psp.dev_list_devices
  ...
  ok 28 psp.removal_device_bi
  # Totals: pass:28 fail:0 xfail:0 xpass:0 skip:0 error:0
  #
  # Responder logs (0):
  # STDERR:
  #  Set PSP enable on device 3 to 0xf
  #  Set PSP enable on device 3 to 0x0

Signed-off-by: Daniel Zahka <daniel.zahka@gmail.com>
====================

Link: https://patch.msgid.link/20251216-psp-test-fix-v1-0-3b5a6dde186f@gmail.com


Signed-off-by: Paolo Abeni <pabeni@redhat.com>

parents df60c332 f0e5126f

tools/testing/selftests/drivers/net/psp.py

+4 −2

Original line number	Diff line number	Diff line
		@@ -573,8 +573,9 @@ def psp_ip_ver_test_builder(name, test_func, psp_ver, ipver):
		"""Build test cases for each combo of PSP version and IP version"""
		def test_case(cfg):
		cfg.require_ipver(ipver)
		test_case.__name__ = f"{name}_v{psp_ver}_ip{ipver}"
		test_func(cfg, psp_ver, ipver)

		test_case.__name__ = f"{name}_v{psp_ver}_ip{ipver}"
		return test_case


		@@ -582,8 +583,9 @@ def ipver_test_builder(name, test_func, ipver):
		"""Build test cases for each IP version"""
		def test_case(cfg):
		cfg.require_ipver(ipver)
		test_case.__name__ = f"{name}_ip{ipver}"
		test_func(cfg, ipver)

		test_case.__name__ = f"{name}_ip{ipver}"
		return test_case