Commit d992880b authored by Daniel Latypov's avatar Daniel Latypov Committed by Shuah Khan
Browse files

kunit: tool: add support for filtering suites by glob 



This allows running different subsets of tests, e.g.

$ ./tools/testing/kunit/kunit.py build
$ ./tools/testing/kunit/kunit.py exec 'list*'
$ ./tools/testing/kunit/kunit.py exec 'kunit*'

This passes the "kunit_filter.glob" commandline option to the UML
kernel, which currently only supports filtering by suite name.

Signed-off-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 5d31f71e

tools/testing/kunit/kunit.py

+16 −5
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ KunitBuildRequest = namedtuple('KunitBuildRequest', 
			       ['jobs', 'build_dir', 'alltests',

				'make_options'])

KunitExecRequest = namedtuple('KunitExecRequest',

			      ['timeout', 'build_dir', 'alltests'])

			      ['timeout', 'build_dir', 'alltests', 'filter_glob'])

KunitParseRequest = namedtuple('KunitParseRequest',

			       ['raw_output', 'input_data', 'build_dir', 'json'])

KunitRequest = namedtuple('KunitRequest', ['raw_output','timeout', 'jobs',

					   'build_dir', 'alltests', 'json',

					   'make_options'])

					   'build_dir', 'alltests', 'filter_glob',

					   'json', 'make_options'])



KernelDirectoryPath = sys.argv[0].split('tools/testing/kunit/')[0]
@@ -93,6 +93,7 @@ def exec_tests(linux: kunit_kernel.LinuxSourceTree, 
	test_start = time.time()

	result = linux.run_kernel(

		timeout=None if request.alltests else request.timeout,

                filter_glob=request.filter_glob,

		build_dir=request.build_dir)



	test_end = time.time()
@@ -149,7 +150,7 @@ def run_tests(linux: kunit_kernel.LinuxSourceTree, 
		return build_result



	exec_request = KunitExecRequest(request.timeout, request.build_dir,

					request.alltests)

					request.alltests, request.filter_glob)

	exec_result = exec_tests(linux, exec_request)

	if exec_result.status != KunitStatus.SUCCESS:

		return exec_result
@@ -200,6 +201,14 @@ def add_exec_opts(parser) -> None: 
			    type=int,

			    default=300,

			    metavar='timeout')

	parser.add_argument('filter_glob',

			    help='maximum number of seconds to allow for all tests '

			    'to run. This does not include time taken to build the '

			    'tests.',

			    type=str,

			    nargs='?',

			    default='',

			    metavar='filter_glob')



def add_parse_opts(parser) -> None:

	parser.add_argument('--raw_output', help='don\'t format output from kernel',
@@ -266,6 +275,7 @@ def main(argv, linux=None): 
				       cli_args.jobs,

				       cli_args.build_dir,

				       cli_args.alltests,

				       cli_args.filter_glob,

				       cli_args.json,

				       cli_args.make_options)

		result = run_tests(linux, request)
@@ -307,7 +317,8 @@ def main(argv, linux=None): 


		exec_request = KunitExecRequest(cli_args.timeout,

						cli_args.build_dir,

						cli_args.alltests)

						cli_args.alltests,

						cli_args.filter_glob)

		exec_result = exec_tests(linux, exec_request)

		parse_request = KunitParseRequest(cli_args.raw_output,

						  exec_result.result,

tools/testing/kunit/kunit_kernel.py

+3 −1
Original line number Diff line number Diff line
@@ -203,8 +203,10 @@ class LinuxSourceTree(object): 
			return False

		return self.validate_config(build_dir)



	def run_kernel(self, args=[], build_dir='', timeout=None) -> Iterator[str]:

	def run_kernel(self, args=[], build_dir='', filter_glob='', timeout=None) -> Iterator[str]:

		args.extend(['mem=1G', 'console=tty'])

		if filter_glob:

			args.append('kunit.filter_glob='+filter_glob)

		self._ops.linux_bin(args, timeout, build_dir)

		outfile = get_outfile_path(build_dir)

		subprocess.call(['stty', 'sane'])

tools/testing/kunit/kunit_tool_test.py

+9 −6
Original line number Diff line number Diff line
@@ -315,7 +315,8 @@ class KUnitMainTest(unittest.TestCase): 
		kunit.main(['exec'], self.linux_source_mock)

		self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 0)

		self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)

		self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='.kunit', timeout=300)

		self.linux_source_mock.run_kernel.assert_called_once_with(

			build_dir='.kunit', filter_glob='', timeout=300)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))



	def test_run_passes_args_pass(self):
@@ -323,7 +324,7 @@ class KUnitMainTest(unittest.TestCase): 
		self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1)

		self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)

		self.linux_source_mock.run_kernel.assert_called_once_with(

			build_dir='.kunit', timeout=300)

			build_dir='.kunit', filter_glob='', timeout=300)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))



	def test_exec_passes_args_fail(self):
@@ -361,7 +362,8 @@ class KUnitMainTest(unittest.TestCase): 
	def test_exec_timeout(self):

		timeout = 3453

		kunit.main(['exec', '--timeout', str(timeout)], self.linux_source_mock)

		self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='.kunit', timeout=timeout)

		self.linux_source_mock.run_kernel.assert_called_once_with(

			build_dir='.kunit', filter_glob='', timeout=timeout)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))



	def test_run_timeout(self):
@@ -369,7 +371,7 @@ class KUnitMainTest(unittest.TestCase): 
		kunit.main(['run', '--timeout', str(timeout)], self.linux_source_mock)

		self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1)

		self.linux_source_mock.run_kernel.assert_called_once_with(

			build_dir='.kunit', timeout=timeout)

			build_dir='.kunit', filter_glob='', timeout=timeout)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))



	def test_run_builddir(self):
@@ -377,7 +379,7 @@ class KUnitMainTest(unittest.TestCase): 
		kunit.main(['run', '--build_dir=.kunit'], self.linux_source_mock)

		self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1)

		self.linux_source_mock.run_kernel.assert_called_once_with(

			build_dir=build_dir, timeout=300)

			build_dir=build_dir, filter_glob='', timeout=300)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))



	def test_config_builddir(self):
@@ -393,7 +395,8 @@ class KUnitMainTest(unittest.TestCase): 
	def test_exec_builddir(self):

		build_dir = '.kunit'

		kunit.main(['exec', '--build_dir', build_dir], self.linux_source_mock)

		self.linux_source_mock.run_kernel.assert_called_once_with(build_dir=build_dir, timeout=300)

		self.linux_source_mock.run_kernel.assert_called_once_with(

			build_dir=build_dir, filter_glob='', timeout=300)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))



	@mock.patch.object(kunit_kernel, 'LinuxSourceTree')