diff options
| author | Cleber Rosa | 2021-02-03 18:23:37 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2021-02-08 17:22:36 +0100 |
| commit | b5a86c482d9c18b594b7dc8c37acc5bc72c4279a (patch) | |
| tree | 27aed8d2c909b67fdf1a3aef2be8806204928c75 /tests/acceptance | |
| parent | tests/acceptance/boot_linux: fix typo on cloudinit error message (diff) | |
| download | qemu-b5a86c482d9c18b594b7dc8c37acc5bc72c4279a.tar.gz qemu-b5a86c482d9c18b594b7dc8c37acc5bc72c4279a.tar.xz qemu-b5a86c482d9c18b594b7dc8c37acc5bc72c4279a.zip | |
tests/acceptance/boot_linux: rename misleading cloudinit method
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>
Diffstat (limited to 'tests/acceptance')
| -rw-r--r-- | tests/acceptance/boot_linux.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 2ac3e57587..bcd923bb4a 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -57,7 +57,7 @@ class BootLinuxBase(Test): 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 @@ class BootLinux(BootLinuxBase): 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): |