Commit 1cdba21d authored by Daniel Latypov's avatar Daniel Latypov Committed by Shuah Khan

kunit: add ability to specify suite-level init and exit functions

KUnit has support for setup/cleanup logic for each test case in a suite.
But it lacks the ability to specify setup/cleanup for the entire suite
itself.

This can be used to do setup that is too expensive or cumbersome to do
for each test.
Or it can be used to do simpler things like log debug information after
the suite completes.
It's a fairly common feature, so the lack of it is noticeable.

Some examples in other frameworks and languages:
* https://docs.python.org/3/library/unittest.html#setupclass-and-teardownclass
* https://google.github.io/googletest/reference/testing.html#Test::SetUpTestSuite

Meta:
This is very similar to this patch here: https://lore.kernel.org/linux-kselftest/20210805043503.20252-3-bvanassche@acm.org/
The changes from that patch:
* pass in `struct kunit *` so users can do stuff like
  `kunit_info(suite, "debug message")`
* makes sure the init failure is bubbled up as a failure
* updates kunit-example-test.c to use a suite init
* Updates kunit/usage.rst to mention the new support
* some minor cosmetic things
  * use `suite_{init,exit}` instead of `{init/exit}_suite`
  * make suite init error message more consistent w/ test init
  * etc.
Signed-off-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent cae56e17
...@@ -125,8 +125,8 @@ We need many test cases covering all the unit's behaviors. It is common to have ...@@ -125,8 +125,8 @@ We need many test cases covering all the unit's behaviors. It is common to have
many similar tests. In order to reduce duplication in these closely related many similar tests. In order to reduce duplication in these closely related
tests, most unit testing frameworks (including KUnit) provide the concept of a tests, most unit testing frameworks (including KUnit) provide the concept of a
*test suite*. A test suite is a collection of test cases for a unit of code *test suite*. A test suite is a collection of test cases for a unit of code
with a setup function that gets invoked before every test case and then a tear with optional setup and teardown functions that run before/after the whole
down function that gets invoked after every test case completes. For example: suite and/or every test case. For example:
.. code-block:: c .. code-block:: c
...@@ -141,16 +141,19 @@ down function that gets invoked after every test case completes. For example: ...@@ -141,16 +141,19 @@ down function that gets invoked after every test case completes. For example:
.name = "example", .name = "example",
.init = example_test_init, .init = example_test_init,
.exit = example_test_exit, .exit = example_test_exit,
.suite_init = example_suite_init,
.suite_exit = example_suite_exit,
.test_cases = example_test_cases, .test_cases = example_test_cases,
}; };
kunit_test_suite(example_test_suite); kunit_test_suite(example_test_suite);
In the above example, the test suite ``example_test_suite`` would run the test In the above example, the test suite ``example_test_suite`` would first run
cases ``example_test_foo``, ``example_test_bar``, and ``example_test_baz``. Each ``example_suite_init``, then run the test cases ``example_test_foo``,
would have ``example_test_init`` called immediately before it and ``example_test_bar``, and ``example_test_baz``. Each would have
``example_test_exit`` called immediately after it. ``example_test_init`` called immediately before it and ``example_test_exit``
``kunit_test_suite(example_test_suite)`` registers the test suite with the called immediately after it. Finally, ``example_suite_exit`` would be called
KUnit test framework. after everything else. ``kunit_test_suite(example_test_suite)`` registers the
test suite with the KUnit test framework.
.. note:: .. note::
A test case will only run if it is associated with a test suite. A test case will only run if it is associated with a test suite.
......
...@@ -153,6 +153,8 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) ...@@ -153,6 +153,8 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)
* struct kunit_suite - describes a related collection of &struct kunit_case * struct kunit_suite - describes a related collection of &struct kunit_case
* *
* @name: the name of the test. Purely informational. * @name: the name of the test. Purely informational.
* @suite_init: called once per test suite before the test cases.
* @suite_exit: called once per test suite after all test cases.
* @init: called before every test case. * @init: called before every test case.
* @exit: called after every test case. * @exit: called after every test case.
* @test_cases: a null terminated array of test cases. * @test_cases: a null terminated array of test cases.
...@@ -167,6 +169,8 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) ...@@ -167,6 +169,8 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)
*/ */
struct kunit_suite { struct kunit_suite {
const char name[256]; const char name[256];
int (*suite_init)(struct kunit_suite *suite);
void (*suite_exit)(struct kunit_suite *suite);
int (*init)(struct kunit *test); int (*init)(struct kunit *test);
void (*exit)(struct kunit *test); void (*exit)(struct kunit *test);
struct kunit_case *test_cases; struct kunit_case *test_cases;
...@@ -175,6 +179,7 @@ struct kunit_suite { ...@@ -175,6 +179,7 @@ struct kunit_suite {
char status_comment[KUNIT_STATUS_COMMENT_SIZE]; char status_comment[KUNIT_STATUS_COMMENT_SIZE];
struct dentry *debugfs; struct dentry *debugfs;
char *log; char *log;
int suite_init_err;
}; };
/** /**
......
...@@ -40,6 +40,17 @@ static int example_test_init(struct kunit *test) ...@@ -40,6 +40,17 @@ static int example_test_init(struct kunit *test)
return 0; return 0;
} }
/*
* This is run once before all test cases in the suite.
* See the comment on example_test_suite for more information.
*/
static int example_test_init_suite(struct kunit_suite *suite)
{
kunit_info(suite, "initializing suite\n");
return 0;
}
/* /*
* This test should always be skipped. * This test should always be skipped.
*/ */
...@@ -142,17 +153,20 @@ static struct kunit_case example_test_cases[] = { ...@@ -142,17 +153,20 @@ static struct kunit_case example_test_cases[] = {
* may be specified which runs after every test case and can be used to for * may be specified which runs after every test case and can be used to for
* cleanup. For clarity, running tests in a test suite would behave as follows: * cleanup. For clarity, running tests in a test suite would behave as follows:
* *
* suite.suite_init(suite);
* suite.init(test); * suite.init(test);
* suite.test_case[0](test); * suite.test_case[0](test);
* suite.exit(test); * suite.exit(test);
* suite.init(test); * suite.init(test);
* suite.test_case[1](test); * suite.test_case[1](test);
* suite.exit(test); * suite.exit(test);
* suite.suite_exit(suite);
* ...; * ...;
*/ */
static struct kunit_suite example_test_suite = { static struct kunit_suite example_test_suite = {
.name = "example", .name = "example",
.init = example_test_init, .init = example_test_init,
.suite_init = example_test_init_suite,
.test_cases = example_test_cases, .test_cases = example_test_cases,
}; };
......
...@@ -179,6 +179,9 @@ enum kunit_status kunit_suite_has_succeeded(struct kunit_suite *suite) ...@@ -179,6 +179,9 @@ enum kunit_status kunit_suite_has_succeeded(struct kunit_suite *suite)
const struct kunit_case *test_case; const struct kunit_case *test_case;
enum kunit_status status = KUNIT_SKIPPED; enum kunit_status status = KUNIT_SKIPPED;
if (suite->suite_init_err)
return KUNIT_FAILURE;
kunit_suite_for_each_test_case(suite, test_case) { kunit_suite_for_each_test_case(suite, test_case) {
if (test_case->status == KUNIT_FAILURE) if (test_case->status == KUNIT_FAILURE)
return KUNIT_FAILURE; return KUNIT_FAILURE;
...@@ -498,6 +501,15 @@ int kunit_run_tests(struct kunit_suite *suite) ...@@ -498,6 +501,15 @@ int kunit_run_tests(struct kunit_suite *suite)
struct kunit_result_stats suite_stats = { 0 }; struct kunit_result_stats suite_stats = { 0 };
struct kunit_result_stats total_stats = { 0 }; struct kunit_result_stats total_stats = { 0 };
if (suite->suite_init) {
suite->suite_init_err = suite->suite_init(suite);
if (suite->suite_init_err) {
kunit_err(suite, KUNIT_SUBTEST_INDENT
"# failed to initialize (%d)", suite->suite_init_err);
goto suite_end;
}
}
kunit_print_suite_start(suite); kunit_print_suite_start(suite);
kunit_suite_for_each_test_case(suite, test_case) { kunit_suite_for_each_test_case(suite, test_case) {
...@@ -551,7 +563,11 @@ int kunit_run_tests(struct kunit_suite *suite) ...@@ -551,7 +563,11 @@ int kunit_run_tests(struct kunit_suite *suite)
kunit_accumulate_stats(&total_stats, param_stats); kunit_accumulate_stats(&total_stats, param_stats);
} }
if (suite->suite_exit)
suite->suite_exit(suite);
kunit_print_suite_stats(suite, suite_stats, total_stats); kunit_print_suite_stats(suite, suite_stats, total_stats);
suite_end:
kunit_print_suite_end(suite); kunit_print_suite_end(suite);
return 0; return 0;
...@@ -562,6 +578,7 @@ static void kunit_init_suite(struct kunit_suite *suite) ...@@ -562,6 +578,7 @@ static void kunit_init_suite(struct kunit_suite *suite)
{ {
kunit_debugfs_create_suite(suite); kunit_debugfs_create_suite(suite);
suite->status_comment[0] = '\0'; suite->status_comment[0] = '\0';
suite->suite_init_err = 0;
} }
int __kunit_test_suites_init(struct kunit_suite * const * const suites) int __kunit_test_suites_init(struct kunit_suite * const * const suites)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment