From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FDF4C433DB for ; Mon, 8 Feb 2021 20:06:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 779F464D5D for ; Mon, 8 Feb 2021 20:06:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 779F464D5D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9CnN-0001T1-QI for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 15:06:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l96kW-0003Bx-JC for qemu-devel@nongnu.org; Mon, 08 Feb 2021 08:38:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l96k5-00055X-LZ for qemu-devel@nongnu.org; Mon, 08 Feb 2021 08:38:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612791496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nm/ExYlKufTmMZyvqaMCH5BvpDN6afR/9tY/eyJ/hhU=; b=dNw+7DDLvIc+bG7LhjYUPFlwNqO5lA2jfNZyyOtYeTIkHe6DSwmadrQy0TQl80N00hLPdX fiJaZU1WOIXafWXt1yPHwv8X8xY/fiGNzARqgWEmelC4kcOLcRjWB90eRbTObApI+j94g3 2S4aY/0QZjOSirdvGzSWDaVnpprSySg= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-352-5fdcgSwmMqqWOhj-7-af8g-1; Mon, 08 Feb 2021 08:38:14 -0500 X-MC-Unique: 5fdcgSwmMqqWOhj-7-af8g-1 Received: by mail-wr1-f71.google.com with SMTP id m7so13267516wro.12 for ; Mon, 08 Feb 2021 05:38:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nm/ExYlKufTmMZyvqaMCH5BvpDN6afR/9tY/eyJ/hhU=; b=o3ejoUAXUnVfPJ1EtOKq24Yja7QIU5uUe3OdGLouQLOMUkjO75d0XKJMZoDlCZKwG5 hloXBGzEewy7JrFp0iEzOC83zSFwOm+XhxK11n4+sLGMxVNZnkECNBByo7ngxXq1gzdQ JnTmVLbsB2K2JEEiAJo26+vRyiJcx+RDoYksVIwTjNzFA7m6r9XJnBdeWt/aIuJ0fX25 VpQoqxoDrhVse+2w8v8iRHKJuynVhujNvgM0FHlIWuM0spqe1O2ys3X6rYkH5rlTFNAL VIlPc0EhkZx21ZyPWE6pPQF6jCF2ZJv/UgPdSMdwpXcMH744ahObIs+mjZBGv1Q6Db3x VgNQ== X-Gm-Message-State: AOAM533aozkvJlVVfkmpEeAvs/qVc33DspMoSNHBJP3CzAa9gMYQpumZ 9TDJaahOrRYKFAsY3i5i38mTPJOyMcAL303yGBsKkNjkQYm4baoV/GB47OR5D2MXNfwiFkt8CiU 9B09BtN+FNU0BfTfqBqs2A/+8HhA0oMKJkZb+eHehNpgmncktu5q5shePKOrd5iZR X-Received: by 2002:a1c:7d41:: with SMTP id y62mr14448718wmc.139.1612791493039; Mon, 08 Feb 2021 05:38:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtxV+C9+SWVwL6VXEnWtsInoVEWIAsYlI5B4HmtwQuM1Med9IZ75/uYsQMXDoQ25gTqLpzoQ== X-Received: by 2002:a1c:7d41:: with SMTP id y62mr14448698wmc.139.1612791492755; Mon, 08 Feb 2021 05:38:12 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id s64sm22086029wms.21.2021.02.08.05.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:38:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/18] tests/acceptance/boot_linux: rename misleading cloudinit method Date: Mon, 8 Feb 2021 14:37:04 +0100 Message-Id: <20210208133711.2596075-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com> References: <20210208133711.2596075-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.57, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: Thomas Huth , Beraldo Leal , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa There's no downloading happening on that method, so let's call it "prepare" instead. While at it, and because of it, the current "prepare_boot" and "prepare_cloudinit" are also renamed. The reasoning here is that "prepare_" methods will just work on the images, while "set_up_" will make them effective to the VM that will be launched. Inspiration comes from the "virtiofs_submounts.py" tests, which this expects to converge more into. Signed-off-by: Cleber Rosa Reviewed-by: Alex Bennée Reviewed-by: Beraldo Leal Reviewed-by: Thomas Huth Message-Id: <20210203172357.1422425-3-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/boot_linux.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 2ac3e575874..bcd923bb4a0 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -57,7 +57,7 @@ def download_boot(self): self.cancel('Failed to download/prepare boot image') return boot.path - def download_cloudinit(self, ssh_pubkey=None): + def prepare_cloudinit(self, ssh_pubkey=None): self.log.info('Preparing cloudinit image') try: cloudinit_iso = os.path.join(self.workdir, 'cloudinit.iso') @@ -85,15 +85,15 @@ def setUp(self, ssh_pubkey=None): super(BootLinux, self).setUp() self.vm.add_args('-smp', '2') self.vm.add_args('-m', '1024') - self.prepare_boot() - self.prepare_cloudinit(ssh_pubkey) + self.set_up_boot() + self.set_up_cloudinit(ssh_pubkey) - def prepare_boot(self): + def set_up_boot(self): path = self.download_boot() self.vm.add_args('-drive', 'file=%s' % path) - def prepare_cloudinit(self, ssh_pubkey=None): - cloudinit_iso = self.download_cloudinit(ssh_pubkey) + def set_up_cloudinit(self, ssh_pubkey=None): + cloudinit_iso = self.prepare_cloudinit(ssh_pubkey) self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso) def launch_and_wait(self): -- 2.26.2