From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPm-00082r-7r for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNqPf-0008UX-6V for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45530 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPe-0008T3-O6 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 12 Mar 2014 22:09:45 +0100 Message-Id: <1394658603-13650-14-git-send-email-afaerber@suse.de> In-Reply-To: <1394658603-13650-1-git-send-email-afaerber@suse.de> References: <1394658603-13650-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0-rc0 13/31] qdev-monitor-test: Don't test human-readable error message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Markus Armbruster Test the error class instead. Expecting a specific message is fragile. In fact, it broke once already, in commit 75884af. Restore the test of error member "class" dropped there, and drop the test of error member "desc". There are no other tests of "desc" as far as I can tell. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Signed-off-by: Andreas F=C3=A4rber --- tests/qdev-monitor-test.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/qdev-monitor-test.c b/tests/qdev-monitor-test.c index eefaab8..e20ffd6 100644 --- a/tests/qdev-monitor-test.c +++ b/tests/qdev-monitor-test.c @@ -32,9 +32,7 @@ static void test_device_add(void) "}}"); g_assert(response); error =3D qdict_get_qdict(response, "error"); - g_assert_cmpstr(qdict_get_try_str(error, "desc"), - =3D=3D, - "Device needs media, but drive is empty"); + g_assert_cmpstr(qdict_get_try_str(error, "class"), =3D=3D, "GenericE= rror"); QDECREF(response); =20 /* Delete the drive */ --=20 1.8.4.5