From nobody Sun May 19 03:38:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568387037; cv=none; d=zoho.com; s=zohoarc; b=hnDrZPP1EVHFgDN2dTduwG8J7PO97/ymBVddNO0HBTwFo9CLFktN12JjzNF8uJRSUEWzPsfBFqfMz4fz1gle8+CKtYXEHLGf4lY3yPj7GXXdkMlDL0EvlGPBD7Iqq+9YHtPczsX5cpEcBWm6aGwvnMfy+3GhUnJtp6nZeZIicq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568387037; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=G525LHQZGIT7Cmqww5lEzjipFbbHdWWALemW4QbXofU=; b=a4fWlzqBCLmedKnhquasR93qe9MPngc8Q4MIHwTrE3dVFugW8FprOLzcc2frcAoIl2NgrxGnBR4tZWkskWV3GWWy+LcSFuhfqDgyJqRKHrYOkQPMA4Ws4PHdQet+3WRE6i2NSL5dSWMgnnkZczgwiqtIA6GAFMGBE2qiZGRFzCA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1568387037263341.28152594594394; Fri, 13 Sep 2019 08:03:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 801FDC08E2A3; Fri, 13 Sep 2019 15:03:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A8B75D721; Fri, 13 Sep 2019 15:03:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2B18024F31; Fri, 13 Sep 2019 15:03:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8DF3oCq003978 for ; Fri, 13 Sep 2019 11:03:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 93BD8194B9; Fri, 13 Sep 2019 15:03:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF369194BB; Fri, 13 Sep 2019 15:03:45 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 13 Sep 2019 16:03:43 +0100 Message-Id: <20190913150343.11344-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] tests: remove use of virTestOOMActive from bhyve testsuite X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 13 Sep 2019 15:03:55 +0000 (UTC) The virTestOOMActive method was deleted in commit 2c52ecd96086b4643b99b4570b5823d40ce2787b Author: Daniel P. Berrang=C3=A9 Date: Thu Aug 29 13:04:07 2019 +0100 util: purge all code for testing OOM handling Signed-off-by: Daniel P. Berrang=C3=A9 --- Pushed as a CI build fix for FreeBSD tests/bhyveargv2xmltest.c | 44 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index 1684f03355..d108366682 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -39,38 +39,36 @@ testCompareXMLToArgvFiles(const char *xmlfile, =20 if (!(vmdef =3D bhyveParseCommandLineString(cmd, driver.bhyvecaps, driver.xmlopt))) { - if ((flags & FLAG_EXPECT_FAILURE) && !virTestOOMActive()) { - VIR_TEST_DEBUG("Got expected failure from " - "bhyveParseCommandLineString."); + if ((flags & FLAG_EXPECT_FAILURE)) { + VIR_TEST_DEBUG("Got expected failure from " + "bhyveParseCommandLineString."); } else { goto fail; } - } else if ((flags & FLAG_EXPECT_FAILURE) && !virTestOOMActive()) { + } else if ((flags & FLAG_EXPECT_FAILURE)) { VIR_TEST_DEBUG("Did not get expected failure from " "bhyveParseCommandLineString."); goto fail; } =20 - if (!virTestOOMActive()) { - if ((log =3D virTestLogContentAndReset()) =3D=3D NULL) + if ((log =3D virTestLogContentAndReset()) =3D=3D NULL) + goto fail; + if (flags & FLAG_EXPECT_WARNING) { + if (*log) { + VIR_TEST_DEBUG("Got expected warning from " + "bhyveParseCommandLineString:\n%s", + log); + } else { + VIR_TEST_DEBUG("bhyveParseCommandLineString " + "should have logged a warning"); + goto fail; + } + } else { /* didn't expect a warning */ + if (*log) { + VIR_TEST_DEBUG("Got unexpected warning from " + "bhyveParseCommandLineString:\n%s", + log); goto fail; - if (flags & FLAG_EXPECT_WARNING) { - if (*log) { - VIR_TEST_DEBUG("Got expected warning from " - "bhyveParseCommandLineString:\n%s", - log); - } else { - VIR_TEST_DEBUG("bhyveParseCommandLineString " - "should have logged a warning"); - goto fail; - } - } else { /* didn't expect a warning */ - if (*log) { - VIR_TEST_DEBUG("Got unexpected warning from " - "bhyveParseCommandLineString:\n%s", - log); - goto fail; - } } } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list