From patchwork Thu Aug 4 10:39:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 73267 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1319070qga; Thu, 4 Aug 2016 03:39:41 -0700 (PDT) X-Received: by 10.194.240.4 with SMTP id vw4mr36258wjc.134.1470307181205; Thu, 04 Aug 2016 03:39:41 -0700 (PDT) Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id u62si3294922wmd.129.2016.08.04.03.39.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Aug 2016 03:39:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bVG3v-0007Ki-M0; Thu, 04 Aug 2016 11:39:39 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Daniel P. Berrange" Subject: [PATCH] tests: Rename qtests which have names ending "error" Date: Thu, 4 Aug 2016 11:39:38 +0100 Message-Id: <1470307178-22848-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 We have three qtest tests which have test names ending with "error". This is awkward because the output of verbose test runs looks like /crypto/task/error: OK /crypto/task/thread_error: OK which gives false positives if you are grepping build logs for errors by looking for "error:". Since there are only three tests with this problem, just rename them all to 'failure' instead. Signed-off-by: Peter Maydell --- Per discussion on IRC yesterday. I might throw this one into 2.7, I dunno. In particular the grep rune I run over build logs for merges looks for "error:" among other things, so these false positives are irritating. --- tests/test-io-task.c | 8 ++++---- tests/test-qmp-commands.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/tests/test-io-task.c b/tests/test-io-task.c index a36cb82..e091c12 100644 --- a/tests/test-io-task.c +++ b/tests/test-io-task.c @@ -110,7 +110,7 @@ static void test_task_data_free(void) } -static void test_task_error(void) +static void test_task_failure(void) { QIOTask *task; Object *obj = object_new(TYPE_DUMMY); @@ -214,7 +214,7 @@ static void test_task_thread_complete(void) } -static void test_task_thread_error(void) +static void test_task_thread_failure(void) { QIOTask *task; Object *obj = object_new(TYPE_DUMMY); @@ -262,8 +262,8 @@ int main(int argc, char **argv) type_register_static(&dummy_info); g_test_add_func("/crypto/task/complete", test_task_complete); g_test_add_func("/crypto/task/datafree", test_task_data_free); - g_test_add_func("/crypto/task/error", test_task_error); + g_test_add_func("/crypto/task/failure", test_task_failure); g_test_add_func("/crypto/task/thread_complete", test_task_thread_complete); - g_test_add_func("/crypto/task/thread_error", test_task_thread_error); + g_test_add_func("/crypto/task/thread_failure", test_task_thread_failure); return g_test_run(); } diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 5af1a46..261fd9e 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -103,7 +103,7 @@ static void test_dispatch_cmd(void) } /* test commands that return an error due to invalid parameters */ -static void test_dispatch_cmd_error(void) +static void test_dispatch_cmd_failure(void) { QDict *req = qdict_new(); QObject *resp; @@ -253,7 +253,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd); - g_test_add_func("/0.15/dispatch_cmd_error", test_dispatch_cmd_error); + g_test_add_func("/0.15/dispatch_cmd_failure", test_dispatch_cmd_failure); g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io); g_test_add_func("/0.15/dealloc_types", test_dealloc_types); g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);