From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t 4/9] runner/runner_tests: Extract helper for inspecting test result
Date: Wed, 12 Feb 2020 15:21:18 +0200 [thread overview]
Message-ID: <20200212132123.108506-5-arkadiusz.hiler@intel.com> (raw)
In-Reply-To: <20200212132123.108506-1-arkadiusz.hiler@intel.com>
to make this bit of code more readable and to reuse it in the following patch
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
runner/runner_tests.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/runner/runner_tests.c b/runner/runner_tests.c
index ed30b3f9..dd590f33 100644
--- a/runner/runner_tests.c
+++ b/runner/runner_tests.c
@@ -32,6 +32,16 @@ static const char testdatadir[] = TESTDATA_DIRECTORY;
/* The total number of test binaries in runner/testdata/ */
#define NUM_TESTDATA_BINARIES 4
+static const char *igt_get_result(struct json_object *tests, const char* testname)
+{
+ struct json_object *obj;
+
+ igt_assert(json_object_object_get_ex(tests, testname, &obj));
+ igt_assert(json_object_object_get_ex(obj, "result", &obj));
+
+ return json_object_get_string(obj);
+}
+
static void igt_assert_eqstr(const char *one, const char *two)
{
if (one == NULL && two == NULL)
@@ -1432,7 +1442,7 @@ igt_main
igt_subtest("dynamic-subtests-in-testlist") {
struct execute_state state;
- struct json_object *results, *obj;
+ struct json_object *results, *tests;
const char *argv[] = { "runner",
"--test-list", filename,
testdatadir,
@@ -1453,16 +1463,13 @@ igt_main
igt_assert_f((results = generate_results_json(dirfd)) != NULL,
"Results parsing failed\n");
- obj = results;
- igt_assert(json_object_object_get_ex(obj, "tests", &obj));
+ igt_assert(json_object_object_get_ex(results, "tests", &tests));
/* Check that the dynamic subtest we didn't request is not reported */
- igt_assert(!json_object_object_get_ex(obj, "igt@dynamic@dynamic-subtest@failing", NULL));
+ igt_assert_no_result_for(tests, "igt@dynamic@dynamic-subtest@failing");
/* Check that the dynamic subtest we did request is */
- igt_assert(json_object_object_get_ex(obj, "igt@dynamic@dynamic-subtest@passing", &obj));
- igt_assert(json_object_object_get_ex(obj, "result", &obj));
- igt_assert_eqstr(json_object_get_string(obj), "pass");
+ igt_assert_eqstr(igt_get_result(tests, "igt@dynamic@dynamic-subtest@passing"), "pass");
igt_assert_eq(json_object_put(results), 1);
}
@@ -1490,7 +1497,7 @@ igt_main
igt_subtest("dynamic-subtest-failure-should-not-cause-warn") {
struct execute_state state;
- struct json_object *results, *obj;
+ struct json_object *results, *tests;
const char *argv[] = { "runner",
"-t", "dynamic",
testdatadir,
@@ -1507,12 +1514,9 @@ igt_main
igt_assert_f((results = generate_results_json(dirfd)) != NULL,
"Results parsing failed\n");
- obj = results;
- igt_assert(json_object_object_get_ex(obj, "tests", &obj));
- igt_assert(json_object_object_get_ex(obj, "igt@dynamic@dynamic-subtest@passing", &obj));
- igt_assert(json_object_object_get_ex(obj, "result", &obj));
+ igt_assert(json_object_object_get_ex(results, "tests", &tests));
- igt_assert_eqstr(json_object_get_string(obj), "pass");
+ igt_assert_eqstr(igt_get_result(tests, "igt@dynamic@dynamic-subtest@passing"), "pass");
igt_assert_eq(json_object_put(results), 1);
}
--
2.24.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-02-12 13:21 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 13:21 [igt-dev] [PATCH i-g-t 0/9] Abort on Chamelium failure Arkadiusz Hiler
2020-02-12 13:21 ` [igt-dev] [PATCH i-g-t 1/9] lib/tests: Extract fork helpers Arkadiusz Hiler
2020-02-14 11:57 ` Petri Latvala
2020-02-12 13:21 ` [igt-dev] [PATCH i-g-t 2/9] lib/tests: Add support for redirecting fork output to /dev/null Arkadiusz Hiler
2020-02-14 12:01 ` Petri Latvala
2020-02-12 13:21 ` [igt-dev] [PATCH i-g-t 3/9] lib: Make it possible to abort the whole execution from inside of a test Arkadiusz Hiler
2020-02-14 12:04 ` Petri Latvala
2020-02-12 13:21 ` Arkadiusz Hiler [this message]
2020-02-12 13:37 ` [igt-dev] [PATCH i-g-t 4/9] runner/runner_tests: Extract helper for inspecting test result Petri Latvala
2020-02-12 13:42 ` Petri Latvala
2020-02-12 13:59 ` Arkadiusz Hiler
2020-02-14 12:05 ` Petri Latvala
2020-02-12 13:22 ` [igt-dev] [PATCH i-g-t 5/9] runner: Abort the run when test exits with IGT_EXIT_ABORT Arkadiusz Hiler
2020-02-14 12:16 ` Petri Latvala
2020-02-12 13:22 ` [igt-dev] [PATCH i-g-t 6/9] lib/chamelium: Clear error after checking if chamelium is reachable Arkadiusz Hiler
2020-02-14 12:17 ` Petri Latvala
2020-02-12 13:23 ` [igt-dev] [PATCH i-g-t 7/9] lib/chamelium: Make it clear that function asserts Arkadiusz Hiler
2020-02-14 12:19 ` Petri Latvala
2020-02-17 13:45 ` Arkadiusz Hiler
2020-02-17 14:00 ` Petri Latvala
2020-02-17 14:11 ` Arkadiusz Hiler
2020-02-17 14:13 ` Petri Latvala
2020-02-12 13:23 ` [igt-dev] [PATCH i-g-t 8/9] lib/chamelium: Add functions to initialize XMLRPC only Arkadiusz Hiler
2020-02-14 12:22 ` Petri Latvala
2020-02-12 13:23 ` [igt-dev] [PATCH i-g-t 9/9] lib/kms: Try to plug all Chamelium ports, abort if it fails Arkadiusz Hiler
2020-02-14 12:27 ` Petri Latvala
2020-02-12 16:38 ` [igt-dev] ✓ Fi.CI.BAT: success for Abort on Chamelium failure Patchwork
2020-02-14 15:37 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2020-02-25 16:52 [igt-dev] [PATCH i-g-t 1/9] lib/tests: Extract fork helpers Arkadiusz Hiler
2020-02-25 16:55 ` [igt-dev] [PATCH i-g-t 4/9] runner/runner_tests: Extract helper for inspecting test result Arkadiusz Hiler
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=20200212132123.108506-5-arkadiusz.hiler@intel.com \
--to=arkadiusz.hiler@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=petri.latvala@intel.com \
/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