From patchwork Wed Nov 21 21:48:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cleber Rosa X-Patchwork-Id: 1001414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 430bnS26ycz9s29 for ; Thu, 22 Nov 2018 08:49:16 +1100 (AEDT) Received: from localhost ([::1]:42476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPaMz-0003M7-LC for incoming@patchwork.ozlabs.org; Wed, 21 Nov 2018 16:49:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPaMK-0003KN-Ds for qemu-devel@nongnu.org; Wed, 21 Nov 2018 16:48:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPaMG-0003w5-NW for qemu-devel@nongnu.org; Wed, 21 Nov 2018 16:48:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58136) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPaMG-0003tv-Hv for qemu-devel@nongnu.org; Wed, 21 Nov 2018 16:48:28 -0500 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 488E3315485C; Wed, 21 Nov 2018 21:48:26 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-125-180.rdu2.redhat.com [10.10.125.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 62D315D75D; Wed, 21 Nov 2018 21:48:25 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Wed, 21 Nov 2018 16:48:17 -0500 Message-Id: <20181121214818.22874-2-crosa@redhat.com> In-Reply-To: <20181121214818.22874-1-crosa@redhat.com> References: <20181121214818.22874-1-crosa@redhat.com> MIME-Version: 1.0 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.41]); Wed, 21 Nov 2018 21:48:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/2] RFC: Acceptance tests: add the build directory to the system PATH X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Ortiz , Caio Carrara , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" So that when binaries such as qemu-img are searched for, those in the build tree will be favored. As a clarification, SRC_ROOT_DIR is dependent on the location from where tests are executed, so they are equal to the build directory if one is being used. The original motivation is that Avocado libraries such as avocado.utils.vmimage.get() may use the matching binaries, but it may also apply to any other binary that test code may eventually attempt to execute. Other competing alternatives would be a more explicit path or binary registration mechanism, in which we tell the libraries such as avocado.utils.vmimage, the binaries to use in advance. I think the model proposed here is simpler though, and is not inconsistent with the general approach of favoring the built binaries, and falling back to binaries available in the system. I'd love to have comments on that, though. Signed-off-by: Cleber Rosa --- tests/acceptance/avocado_qemu/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 1e54fd5932..3d5190cbab 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -49,6 +49,15 @@ class Test(avocado.Test): self.cancel("No QEMU binary defined or found in the source tree") self.vm = QEMUMachine(self.qemu_bin) + # RFC: avocado.utils.vmimage.get() uses qemu-img, from the + # system's PATH, to create a snapshot. This is a transparent, + # but implicit way of making sure it finds the qemu-img that + # matches the code being tested (as tests it indirectly too). + # As for the cleanup, given that in the Avocado test execution + # model every test is started in a different process, no + # cleanup is needed. + os.environ['PATH'] = '%s:%s' % (SRC_ROOT_DIR, os.environ['PATH']) + def tearDown(self): if self.vm is not None: self.vm.shutdown()