From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 11/18] tests/acceptance/boot_linux: rename misleading cloudinit method
Date: Mon, 8 Feb 2021 14:37:04 +0100 [thread overview]
Message-ID: <20210208133711.2596075-12-philmd@redhat.com> (raw)
In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com>
From: Cleber Rosa <crosa@redhat.com>
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 <crosa@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210203172357.1422425-3-crosa@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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
next prev parent reply other threads:[~2021-02-08 20:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 13:36 [PULL 00/18] Integration testing patches for 2021-02-08 Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 01/18] tests/acceptance: Extract tesseract_available() helper in new namespace Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 02/18] tests/acceptance: Introduce tesseract_ocr() helper Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 03/18] tests/acceptance: Extract do_test_arm_orangepi_armbian_uboot() method Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 04/18] tests/acceptance: Test U-Boot/Linux from Armbian 20.08 on Orange Pi PC Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 05/18] tests/acceptance: Move the pseries test to a separate file Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 06/18] tests/acceptance: Test the mpc8544ds machine Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 07/18] tests/acceptance: Add a test for the virtex-ml507 ppc machine Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 08/18] tests/acceptance: Increase the timeout in the replay tests Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 09/18] tests/acceptance: Re-enable the microblaze test Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 10/18] tests/acceptance/boot_linux: fix typo on cloudinit error message Philippe Mathieu-Daudé
2021-02-08 13:37 ` Philippe Mathieu-Daudé [this message]
2021-02-08 13:37 ` [PULL 12/18] tests/acceptance/virtiofs_submounts: use workdir property Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 13/18] tests/acceptance/virtiofs_submounts: do not ask for ssh key password Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 14/18] tests/acceptance/virtiofs_submounts: use a virtio-net device instead Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 15/18] tests/acceptance/virtiofs_submounts: standardize port as integer Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 16/18] tests/acceptance/virtiofs_submounts: required space between IP and port Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 17/18] Acceptance tests: clarify ssh connection failure reason Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 18/18] Acceptance Tests: remove unnecessary tag from documentation example Philippe Mathieu-Daudé
2021-02-08 20:06 ` [PULL 00/18] Integration testing patches for 2021-02-08 Peter Maydell
2021-02-08 20:21 ` Philippe Mathieu-Daudé
2021-02-09 10:04 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210208133711.2596075-12-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).