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

kunit: tool: stop using bare asserts in unit test 



Use self.assertEqual/assertNotEqual() instead.
Besides being more appropriate in a unit test, it'll also give a better
error message by show the unexpected values.

Also
* Delete redundant check of exception types. self.assertRaises does this.
* s/kall/call. There's no reason to name it this way.
  * This is probably a misunderstanding from the docs which uses it
  since `mock.call` is in scope as `call`.

Signed-off-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Tested-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Acked-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent cfd607e4

tools/testing/kunit/kunit_tool_test.py

+24 −26
Original line number Diff line number Diff line
@@ -301,26 +301,26 @@ class KUnitMainTest(unittest.TestCase): 


	def test_config_passes_args_pass(self):

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

		assert self.linux_source_mock.build_reconfig.call_count == 1

		assert self.linux_source_mock.run_kernel.call_count == 0

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

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



	def test_build_passes_args_pass(self):

		kunit.main(['build'], self.linux_source_mock)

		assert self.linux_source_mock.build_reconfig.call_count == 0

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

		self.linux_source_mock.build_um_kernel.assert_called_once_with(False, 8, '.kunit', None)

		assert self.linux_source_mock.run_kernel.call_count == 0

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



	def test_exec_passes_args_pass(self):

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

		assert self.linux_source_mock.build_reconfig.call_count == 0

		assert self.linux_source_mock.run_kernel.call_count == 1

		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.print_mock.assert_any_call(StrContains('Testing complete.'))



	def test_run_passes_args_pass(self):

		kunit.main(['run'], self.linux_source_mock)

		assert self.linux_source_mock.build_reconfig.call_count == 1

		assert self.linux_source_mock.run_kernel.call_count == 1

		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)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))
@@ -329,35 +329,33 @@ class KUnitMainTest(unittest.TestCase): 
		self.linux_source_mock.run_kernel = mock.Mock(return_value=[])

		with self.assertRaises(SystemExit) as e:

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

		assert type(e.exception) == SystemExit

		assert e.exception.code == 1

		self.assertEqual(e.exception.code, 1)



	def test_run_passes_args_fail(self):

		self.linux_source_mock.run_kernel = mock.Mock(return_value=[])

		with self.assertRaises(SystemExit) as e:

			kunit.main(['run'], self.linux_source_mock)

		assert type(e.exception) == SystemExit

		assert e.exception.code == 1

		assert self.linux_source_mock.build_reconfig.call_count == 1

		assert self.linux_source_mock.run_kernel.call_count == 1

		self.assertEqual(e.exception.code, 1)

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

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

		self.print_mock.assert_any_call(StrContains(' 0 tests run'))



	def test_exec_raw_output(self):

		self.linux_source_mock.run_kernel = mock.Mock(return_value=[])

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

		assert self.linux_source_mock.run_kernel.call_count == 1

		for kall in self.print_mock.call_args_list:

			assert kall != mock.call(StrContains('Testing complete.'))

			assert kall != mock.call(StrContains(' 0 tests run'))

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

		for call in self.print_mock.call_args_list:

			self.assertNotEqual(call, mock.call(StrContains('Testing complete.')))

			self.assertNotEqual(call, mock.call(StrContains(' 0 tests run')))



	def test_run_raw_output(self):

		self.linux_source_mock.run_kernel = mock.Mock(return_value=[])

		kunit.main(['run', '--raw_output'], self.linux_source_mock)

		assert self.linux_source_mock.build_reconfig.call_count == 1

		assert self.linux_source_mock.run_kernel.call_count == 1

		for kall in self.print_mock.call_args_list:

			assert kall != mock.call(StrContains('Testing complete.'))

			assert kall != mock.call(StrContains(' 0 tests run'))

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

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

		for call in self.print_mock.call_args_list:

			self.assertNotEqual(call, mock.call(StrContains('Testing complete.')))

			self.assertNotEqual(call, mock.call(StrContains(' 0 tests run')))



	def test_exec_timeout(self):

		timeout = 3453
@@ -368,7 +366,7 @@ class KUnitMainTest(unittest.TestCase): 
	def test_run_timeout(self):

		timeout = 3453

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

		assert self.linux_source_mock.build_reconfig.call_count == 1

		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)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))
@@ -376,7 +374,7 @@ class KUnitMainTest(unittest.TestCase): 
	def test_run_builddir(self):

		build_dir = '.kunit'

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

		assert self.linux_source_mock.build_reconfig.call_count == 1

		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)

		self.print_mock.assert_any_call(StrContains('Testing complete.'))
@@ -384,7 +382,7 @@ class KUnitMainTest(unittest.TestCase): 
	def test_config_builddir(self):

		build_dir = '.kunit'

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

		assert self.linux_source_mock.build_reconfig.call_count == 1

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



	def test_build_builddir(self):

		build_dir = '.kunit'