On Tue, 25 Jul 2023 at 00:31, Rae Moar rmoar@google.com wrote:
Add four tests to executor_test.c to test behavior of filtering attributes.
parse_filter_attr_test - to test the parsing of inputted filters
filter_attr_test - to test the filtering procedure on attributes
filter_attr_empty_test - to test the behavior when all tests are filtered out
filter_attr_skip_test - to test the configurable filter_action=skip option
Signed-off-by: Rae Moar rmoar@google.com
Glad to see some tests for the parser-y bits.
Reviewed-by: David Gow davidgow@google.com
Cheers, -- David
Changes since v1:
- No changes.
Changes since RFC v2:
- Change fake suite and test case names.
- Add a few ASSERT statements.
Changes since RFC v1:
- This is a new patch.
lib/kunit/executor_test.c | 116 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+)
diff --git a/lib/kunit/executor_test.c b/lib/kunit/executor_test.c index d7ab069324b5..01280cb8d451 100644 --- a/lib/kunit/executor_test.c +++ b/lib/kunit/executor_test.c @@ -7,6 +7,7 @@ */
#include <kunit/test.h> +#include <kunit/attributes.h>
static void kfree_at_end(struct kunit *test, const void *to_free); static struct kunit_suite *alloc_fake_suite(struct kunit *test, @@ -108,11 +109,126 @@ static void filter_suites_to_empty_test(struct kunit *test) "should be empty to indicate no match"); }
+static void parse_filter_attr_test(struct kunit *test) +{
int j, filter_count;struct kunit_attr_filter *parsed_filters;char *filters = "speed>slow, module!=example";int err = 0;filter_count = kunit_get_filter_count(filters);KUNIT_EXPECT_EQ(test, filter_count, 2);parsed_filters = kunit_kcalloc(test, filter_count + 1, sizeof(*parsed_filters),GFP_KERNEL);for (j = 0; j < filter_count; j++) {parsed_filters[j] = kunit_next_attr_filter(&filters, &err);KUNIT_ASSERT_EQ_MSG(test, err, 0, "failed to parse filter '%s'", filters[j]);}KUNIT_EXPECT_STREQ(test, kunit_attr_filter_name(parsed_filters[0]), "speed");KUNIT_EXPECT_STREQ(test, parsed_filters[0].input, ">slow");KUNIT_EXPECT_STREQ(test, kunit_attr_filter_name(parsed_filters[1]), "module");KUNIT_EXPECT_STREQ(test, parsed_filters[1].input, "!=example");+}
+static struct kunit_case dummy_attr_test_cases[] = {
/* .run_case is not important, just needs to be non-NULL */{ .name = "slow", .run_case = dummy_test, .module_name = "dummy",.attr.speed = KUNIT_SPEED_SLOW },{ .name = "normal", .run_case = dummy_test, .module_name = "dummy" },{},+};
+static void filter_attr_test(struct kunit *test) +{
struct kunit_suite *subsuite[3] = {NULL, NULL};struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};struct suite_set got;int err = 0;subsuite[0] = alloc_fake_suite(test, "normal_suite", dummy_attr_test_cases);subsuite[1] = alloc_fake_suite(test, "slow_suite", dummy_attr_test_cases);subsuite[1]->attr.speed = KUNIT_SPEED_SLOW; // Set suite attribute/** Want: normal_suite(slow, normal), slow_suite(slow, normal),* NULL -> normal_suite(normal), NULL** The normal test in slow_suite is filtered out because the speed* attribute is unset and thus, the filtering is based on the parent attribute* of slow.*/got = kunit_filter_suites(&suite_set, NULL, "speed>slow", NULL, &err);KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);KUNIT_ASSERT_EQ(test, err, 0);kfree_at_end(test, got.start);/* Validate we just have normal_suite */KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);KUNIT_EXPECT_STREQ(test, got.start[0]->name, "normal_suite");KUNIT_ASSERT_EQ(test, got.end - got.start, 1);/* Now validate we just have normal test case */KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]->test_cases);KUNIT_EXPECT_STREQ(test, got.start[0]->test_cases[0].name, "normal");KUNIT_EXPECT_FALSE(test, got.start[0]->test_cases[1].name);+}
+static void filter_attr_empty_test(struct kunit *test) +{
struct kunit_suite *subsuite[3] = {NULL, NULL};struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};struct suite_set got;int err = 0;subsuite[0] = alloc_fake_suite(test, "suite1", dummy_attr_test_cases);subsuite[1] = alloc_fake_suite(test, "suite2", dummy_attr_test_cases);got = kunit_filter_suites(&suite_set, NULL, "module!=dummy", NULL, &err);KUNIT_ASSERT_EQ(test, err, 0);kfree_at_end(test, got.start); /* just in case */KUNIT_EXPECT_PTR_EQ_MSG(test, got.start, got.end,"should be empty to indicate no match");+}
+static void filter_attr_skip_test(struct kunit *test) +{
struct kunit_suite *subsuite[2] = {NULL};struct suite_set suite_set = {.start = subsuite, .end = &subsuite[1]};struct suite_set got;int err = 0;subsuite[0] = alloc_fake_suite(test, "suite", dummy_attr_test_cases);/* Want: suite(slow, normal), NULL -> suite(slow with SKIP, normal), NULL */got = kunit_filter_suites(&suite_set, NULL, "speed>slow", "skip", &err);KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);KUNIT_ASSERT_EQ(test, err, 0);kfree_at_end(test, got.start);/* Validate we have both the slow and normal test */KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]->test_cases);KUNIT_ASSERT_EQ(test, kunit_suite_num_test_cases(got.start[0]), 2);KUNIT_EXPECT_STREQ(test, got.start[0]->test_cases[0].name, "slow");KUNIT_EXPECT_STREQ(test, got.start[0]->test_cases[1].name, "normal");/* Now ensure slow is skipped and normal is not */KUNIT_EXPECT_EQ(test, got.start[0]->test_cases[0].status, KUNIT_SKIPPED);KUNIT_EXPECT_FALSE(test, got.start[0]->test_cases[1].status);+}
static struct kunit_case executor_test_cases[] = { KUNIT_CASE(parse_filter_test), KUNIT_CASE(filter_suites_test), KUNIT_CASE(filter_suites_test_glob_test), KUNIT_CASE(filter_suites_to_empty_test),
KUNIT_CASE(parse_filter_attr_test),KUNIT_CASE(filter_attr_test),KUNIT_CASE(filter_attr_empty_test),KUNIT_CASE(filter_attr_skip_test), {}};
-- 2.41.0.487.g6d72f3e995-goog