From nobody Fri Apr 4 09:56:49 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1590575978; cv=none; d=zohomail.com; s=zohoarc; b=JouCYAOIRNbj/L4uruWjj2OkJkfvyFSNfi3+yIJpAgom7iebb+asB1hDGOnb2S212xUHX6WMIZ6aZcP+EQDxJix5MCvP04uPNPt4x8SfNQ/JpVqjIdDDlURBk9/KAJztaB2zvneQlRzG2NL5XsnvzpSp9GJs1Kuw4FPTMBdEazQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590575978; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q3cyX4z4vDb24pgXcE0f7kOk+nSloH6K4MyBoWdDVCU=; b=cmFm8thcDdjQhCCRjjjnq+eaZA+nwqPaINtkS6okddh4cI19pFjugniEJbS4Safu7YUNeYybz5GEMVla8kXSANXvQdiPKCAkFKg/WI0mHU9Y459aro+20c7v9ckb6Qzc2fgqJn+xgIkDr4yuH7WwgY5aXIKyQzUtkgmTOGRs0fI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590575978843220.75873182323346; Wed, 27 May 2020 03:39:38 -0700 (PDT) Received: from localhost ([::1]:50752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdtTF-00014w-M1 for importer@patchew.org; Wed, 27 May 2020 06:39:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdtLV-000200-5o for qemu-devel@nongnu.org; Wed, 27 May 2020 06:31:37 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33718) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdtLU-000252-2p for qemu-devel@nongnu.org; Wed, 27 May 2020 06:31:36 -0400 Received: from [127.0.1.1] (unknown [62.118.151.149]) by mail.ispras.ru (Postfix) with ESMTPSA id EC0F3CD463; Wed, 27 May 2020 13:31:34 +0300 (MSK) Subject: [PATCH v2 10/11] tests/acceptance: refactor boot_linux to allow code reuse From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Wed, 27 May 2020 13:31:34 +0300 Message-ID: <159057549448.16818.934643360089121728.stgit@pasha-ThinkPad-X280> In-Reply-To: <159057543840.16818.14393433996899521784.stgit@pasha-ThinkPad-X280> References: <159057543840.16818.14393433996899521784.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=83.149.199.45; envelope-from=Pavel.Dovgaluk@gmail.com; helo=mail.ispras.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/27 06:30:39 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: 17 X-Spam_score: 1.7 X-Spam_bar: + X-Spam_report: (1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, FROM_WORDY=1, NML_ADSP_CUSTOM_MED=0.9, SPF_SOFTFAIL=0.665, T_FILL_THIS_FORM_SHORT=0.01, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, alex.bennee@linaro.org, dovgaluk@ispras.ru, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This patch moves image downloading functions to the separate class to allow reusing them from record/replay tests. Signed-off-by: Pavel Dovgalyuk --- 0 files changed diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 075a386300..3aa57e88b0 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -26,22 +26,8 @@ KVM_NOT_AVAILABLE =3D ACCEL_NOT_AVAILABLE_FMT % "KVM" TCG_NOT_AVAILABLE =3D ACCEL_NOT_AVAILABLE_FMT % "TCG" =20 =20 -class BootLinux(Test): - """ - Boots a Linux system, checking for a successful initialization - """ - - timeout =3D 900 - chksum =3D None - - def setUp(self): - super(BootLinux, self).setUp() - self.vm.add_args('-smp', '2') - self.vm.add_args('-m', '1024') - self.prepare_boot() - self.prepare_cloudinit() - - def prepare_boot(self): +class BootLinuxBase(Test): + def download_boot(self): self.log.debug('Looking for and selecting a qemu-img binary to be ' 'used to create the bootable snapshot image') # If qemu-img has been built, use it, otherwise the system wide one @@ -60,17 +46,17 @@ class BootLinux(Test): if image_arch =3D=3D 'ppc64': image_arch =3D 'ppc64le' try: - self.boot =3D vmimage.get( + boot =3D vmimage.get( 'fedora', arch=3Dimage_arch, version=3D'31', checksum=3Dself.chksum, algorithm=3D'sha256', cache_dir=3Dself.cache_dirs[0], snapshot_dir=3Dself.workdir) - self.vm.add_args('-drive', 'file=3D%s' % self.boot.path) except: self.cancel('Failed to download/prepare boot image') + return boot.path =20 - def prepare_cloudinit(self): + def download_cloudinit(self): self.log.info('Preparing cloudinit image') try: cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') @@ -81,9 +67,32 @@ class BootLinux(Test): # QEMU's hard coded usermode router address phone_home_host=3D'10.0.2.2', phone_home_port=3Dself.phone_home_port) - self.vm.add_args('-drive', 'file=3D%s,format=3Draw' % cloudini= t_iso) except Exception: self.cancel('Failed to prepared cloudinit image') + return cloudinit_iso + +class BootLinux(BootLinuxBase): + """ + Boots a Linux system, checking for a successful initialization + """ + + timeout =3D 900 + chksum =3D None + + def setUp(self): + super(BootLinux, self).setUp() + self.vm.add_args('-smp', '2') + self.vm.add_args('-m', '1024') + self.prepare_boot() + self.prepare_cloudinit() + + def prepare_boot(self): + path =3D self.download_boot() + self.vm.add_args('-drive', 'file=3D%s' % path) + + def prepare_cloudinit(self): + cloudinit_iso =3D self.download_cloudinit() + self.vm.add_args('-drive', 'file=3D%s,format=3Draw' % cloudinit_is= o) =20 def launch_and_wait(self): self.vm.set_console()