Linux Kernel Selftest development
 help / color / mirror / Atom feed
From: brendanhiggins at google.com (Brendan Higgins)
Subject: [PATCH v3 12/18] kunit: test: add tests for KUnit managed resources
Date: Mon, 13 May 2019 22:42:46 -0700	[thread overview]
Message-ID: <20190514054251.186196-13-brendanhiggins@google.com> (raw)
In-Reply-To: <20190514054251.186196-1-brendanhiggins@google.com>

From: Avinash Kondareddy <akndr41 at gmail.com>

Add unit tests for KUnit managed resources. KUnit managed resources
(struct kunit_resource) are resources that are automatically cleaned up
at the end of a KUnit test, similar to the concept of devm_* managed
resources.

Signed-off-by: Avinash Kondareddy <akndr41 at gmail.com>
Signed-off-by: Brendan Higgins <brendanhiggins at google.com>
Reviewed-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Reviewed-by: Logan Gunthorpe <logang at deltatee.com>
---
Changes Since Last Revision:
 - Added more details to change log as per Shuah's comments.
 - Made use of new EXPECT macro for pointer comparison to warning
   reported by kbuild bot.
---
 kunit/test-test.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/kunit/test-test.c b/kunit/test-test.c
index 7afc9bb52f7be..ee926f798b266 100644
--- a/kunit/test-test.c
+++ b/kunit/test-test.c
@@ -101,3 +101,126 @@ static struct kunit_module kunit_try_catch_test_module = {
 	.test_cases = kunit_try_catch_test_cases,
 };
 module_test(kunit_try_catch_test_module);
+
+/*
+ * Context for testing test managed resources
+ * is_resource_initialized is used to test arbitrary resources
+ */
+struct kunit_test_resource_context {
+	struct kunit test;
+	bool is_resource_initialized;
+};
+
+static int fake_resource_init(struct kunit_resource *res, void *context)
+{
+	struct kunit_test_resource_context *ctx = context;
+
+	res->allocation = &ctx->is_resource_initialized;
+	ctx->is_resource_initialized = true;
+	return 0;
+}
+
+static void fake_resource_free(struct kunit_resource *res)
+{
+	bool *is_resource_initialized = res->allocation;
+
+	*is_resource_initialized = false;
+}
+
+static void kunit_resource_test_init_resources(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+
+	kunit_init_test(&ctx->test, "testing_test_init_test");
+
+	KUNIT_EXPECT_TRUE(test, list_empty(&ctx->test.resources));
+}
+
+static void kunit_resource_test_alloc_resource(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+	struct kunit_resource *res;
+	kunit_resource_free_t free = fake_resource_free;
+
+	res = kunit_alloc_resource(&ctx->test,
+				   fake_resource_init,
+				   fake_resource_free,
+				   ctx);
+
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, res);
+	KUNIT_EXPECT_PTR_EQ(test,
+			    &ctx->is_resource_initialized, res->allocation);
+	KUNIT_EXPECT_TRUE(test, list_is_last(&res->node, &ctx->test.resources));
+	KUNIT_EXPECT_PTR_EQ(test, free, res->free);
+}
+
+static void kunit_resource_test_free_resource(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+	struct kunit_resource *res = kunit_alloc_resource(&ctx->test,
+							  fake_resource_init,
+							  fake_resource_free,
+							  ctx);
+
+	kunit_free_resource(&ctx->test, res);
+
+	KUNIT_EXPECT_EQ(test, false, ctx->is_resource_initialized);
+	KUNIT_EXPECT_TRUE(test, list_empty(&ctx->test.resources));
+}
+
+static void kunit_resource_test_cleanup_resources(struct kunit *test)
+{
+	int i;
+	struct kunit_test_resource_context *ctx = test->priv;
+	struct kunit_resource *resources[5];
+
+	for (i = 0; i < ARRAY_SIZE(resources); i++) {
+		resources[i] = kunit_alloc_resource(&ctx->test,
+						    fake_resource_init,
+						    fake_resource_free,
+						    ctx);
+	}
+
+	kunit_cleanup(&ctx->test);
+
+	KUNIT_EXPECT_TRUE(test, list_empty(&ctx->test.resources));
+}
+
+static int kunit_resource_test_init(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx =
+			kzalloc(sizeof(*ctx), GFP_KERNEL);
+
+	if (!ctx)
+		return -ENOMEM;
+
+	test->priv = ctx;
+
+	kunit_init_test(&ctx->test, "test_test_context");
+
+	return 0;
+}
+
+static void kunit_resource_test_exit(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+
+	kunit_cleanup(&ctx->test);
+	kfree(ctx);
+}
+
+static struct kunit_case kunit_resource_test_cases[] = {
+	KUNIT_CASE(kunit_resource_test_init_resources),
+	KUNIT_CASE(kunit_resource_test_alloc_resource),
+	KUNIT_CASE(kunit_resource_test_free_resource),
+	KUNIT_CASE(kunit_resource_test_cleanup_resources),
+	{},
+};
+
+static struct kunit_module kunit_resource_test_module = {
+	.name = "kunit-resource-test",
+	.init = kunit_resource_test_init,
+	.exit = kunit_resource_test_exit,
+	.test_cases = kunit_resource_test_cases,
+};
+module_test(kunit_resource_test_module);
-- 
2.21.0.1020.gf2820cf01a-goog

WARNING: multiple messages have this Message-ID (diff)
From: brendanhiggins@google.com (Brendan Higgins)
Subject: [PATCH v3 12/18] kunit: test: add tests for KUnit managed resources
Date: Mon, 13 May 2019 22:42:46 -0700	[thread overview]
Message-ID: <20190514054251.186196-13-brendanhiggins@google.com> (raw)
Message-ID: <20190514054246.Z9sdkqLNmabsGkMsqCL-pZ18O4OgHzpziUo7Ba6sfL8@z> (raw)
In-Reply-To: <20190514054251.186196-1-brendanhiggins@google.com>

From: Avinash Kondareddy <akndr41@gmail.com>

Add unit tests for KUnit managed resources. KUnit managed resources
(struct kunit_resource) are resources that are automatically cleaned up
at the end of a KUnit test, similar to the concept of devm_* managed
resources.

Signed-off-by: Avinash Kondareddy <akndr41 at gmail.com>
Signed-off-by: Brendan Higgins <brendanhiggins at google.com>
Reviewed-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Reviewed-by: Logan Gunthorpe <logang at deltatee.com>
---
Changes Since Last Revision:
 - Added more details to change log as per Shuah's comments.
 - Made use of new EXPECT macro for pointer comparison to warning
   reported by kbuild bot.
---
 kunit/test-test.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/kunit/test-test.c b/kunit/test-test.c
index 7afc9bb52f7be..ee926f798b266 100644
--- a/kunit/test-test.c
+++ b/kunit/test-test.c
@@ -101,3 +101,126 @@ static struct kunit_module kunit_try_catch_test_module = {
 	.test_cases = kunit_try_catch_test_cases,
 };
 module_test(kunit_try_catch_test_module);
+
+/*
+ * Context for testing test managed resources
+ * is_resource_initialized is used to test arbitrary resources
+ */
+struct kunit_test_resource_context {
+	struct kunit test;
+	bool is_resource_initialized;
+};
+
+static int fake_resource_init(struct kunit_resource *res, void *context)
+{
+	struct kunit_test_resource_context *ctx = context;
+
+	res->allocation = &ctx->is_resource_initialized;
+	ctx->is_resource_initialized = true;
+	return 0;
+}
+
+static void fake_resource_free(struct kunit_resource *res)
+{
+	bool *is_resource_initialized = res->allocation;
+
+	*is_resource_initialized = false;
+}
+
+static void kunit_resource_test_init_resources(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+
+	kunit_init_test(&ctx->test, "testing_test_init_test");
+
+	KUNIT_EXPECT_TRUE(test, list_empty(&ctx->test.resources));
+}
+
+static void kunit_resource_test_alloc_resource(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+	struct kunit_resource *res;
+	kunit_resource_free_t free = fake_resource_free;
+
+	res = kunit_alloc_resource(&ctx->test,
+				   fake_resource_init,
+				   fake_resource_free,
+				   ctx);
+
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, res);
+	KUNIT_EXPECT_PTR_EQ(test,
+			    &ctx->is_resource_initialized, res->allocation);
+	KUNIT_EXPECT_TRUE(test, list_is_last(&res->node, &ctx->test.resources));
+	KUNIT_EXPECT_PTR_EQ(test, free, res->free);
+}
+
+static void kunit_resource_test_free_resource(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+	struct kunit_resource *res = kunit_alloc_resource(&ctx->test,
+							  fake_resource_init,
+							  fake_resource_free,
+							  ctx);
+
+	kunit_free_resource(&ctx->test, res);
+
+	KUNIT_EXPECT_EQ(test, false, ctx->is_resource_initialized);
+	KUNIT_EXPECT_TRUE(test, list_empty(&ctx->test.resources));
+}
+
+static void kunit_resource_test_cleanup_resources(struct kunit *test)
+{
+	int i;
+	struct kunit_test_resource_context *ctx = test->priv;
+	struct kunit_resource *resources[5];
+
+	for (i = 0; i < ARRAY_SIZE(resources); i++) {
+		resources[i] = kunit_alloc_resource(&ctx->test,
+						    fake_resource_init,
+						    fake_resource_free,
+						    ctx);
+	}
+
+	kunit_cleanup(&ctx->test);
+
+	KUNIT_EXPECT_TRUE(test, list_empty(&ctx->test.resources));
+}
+
+static int kunit_resource_test_init(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx =
+			kzalloc(sizeof(*ctx), GFP_KERNEL);
+
+	if (!ctx)
+		return -ENOMEM;
+
+	test->priv = ctx;
+
+	kunit_init_test(&ctx->test, "test_test_context");
+
+	return 0;
+}
+
+static void kunit_resource_test_exit(struct kunit *test)
+{
+	struct kunit_test_resource_context *ctx = test->priv;
+
+	kunit_cleanup(&ctx->test);
+	kfree(ctx);
+}
+
+static struct kunit_case kunit_resource_test_cases[] = {
+	KUNIT_CASE(kunit_resource_test_init_resources),
+	KUNIT_CASE(kunit_resource_test_alloc_resource),
+	KUNIT_CASE(kunit_resource_test_free_resource),
+	KUNIT_CASE(kunit_resource_test_cleanup_resources),
+	{},
+};
+
+static struct kunit_module kunit_resource_test_module = {
+	.name = "kunit-resource-test",
+	.init = kunit_resource_test_init,
+	.exit = kunit_resource_test_exit,
+	.test_cases = kunit_resource_test_cases,
+};
+module_test(kunit_resource_test_module);
-- 
2.21.0.1020.gf2820cf01a-goog

  parent reply	other threads:[~2019-05-14  5:42 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-14  5:42 [PATCH v3 00/18] kunit: introduce KUnit, the Linux kernel unit testing framework brendanhiggins
2019-05-14  5:42 ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 01/18] kunit: test: add KUnit test runner core brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 02/18] kunit: test: add test resource management API brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 03/18] kunit: test: add string_stream a std::stream like string builder brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 04/18] kunit: test: add kunit_stream a std::stream like logger brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 05/18] kunit: test: add the concept of expectations brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 06/18] kbuild: enable building KUnit brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 07/18] kunit: test: add initial tests brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 08/18] objtool: add kunit_try_catch_throw to the noreturn list brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  6:56   ` peterz
2019-05-14  6:56     ` Peter Zijlstra
2019-05-14  8:12     ` brendanhiggins
2019-05-14  8:12       ` Brendan Higgins
2019-05-14  8:46       ` peterz
2019-05-14  8:46         ` Peter Zijlstra
2019-05-14 18:12         ` brendanhiggins
2019-05-14 18:12           ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 09/18] kunit: test: add support for test abort brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 10/18] kunit: test: add tests for kunit " brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 11/18] kunit: test: add the concept of assertions brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` brendanhiggins [this message]
2019-05-14  5:42   ` [PATCH v3 12/18] kunit: test: add tests for KUnit managed resources Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 13/18] kunit: tool: add Python wrappers for running KUnit tests brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 14/18] kunit: defconfig: add defconfigs for building " brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 15/18] Documentation: kunit: add documentation for KUnit brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14 13:34   ` corbet
2019-05-14 13:34     ` Jonathan Corbet
2019-05-14 18:08     ` brendanhiggins
2019-05-14 18:08       ` Brendan Higgins
2019-05-14 18:16       ` corbet
2019-05-14 18:16         ` Jonathan Corbet
2019-05-14 23:19         ` brendanhiggins
2019-05-14 23:19           ` Brendan Higgins
2019-05-15 13:45           ` corbet
2019-05-15 13:45             ` Jonathan Corbet
2019-05-14  5:42 ` [PATCH v3 16/18] MAINTAINERS: add entry for KUnit the unit testing framework brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 17/18] kernel/sysctl-test: Add null pointer test for sysctl.c:proc_dointvec() brendanhiggins
2019-05-14  5:42   ` Brendan Higgins
2019-05-14  5:42 ` [PATCH v3 18/18] MAINTAINERS: add proc sysctl KUnit test to PROC SYSCTL section brendanhiggins
2019-05-14  5:42   ` Brendan Higgins

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190514054251.186196-13-brendanhiggins@google.com \
    --to=linux-kselftest@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox