diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2020-10-27 20:13:28 -0600 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-28 13:17:32 +0000 |
| commit | 33dc9914eac581dea9bdea35dcda4d542531d66a (patch) | |
| tree | 3828d7d3f0de8be2c574e7ea94747b03f9169259 /tests/acceptance/boot_linux.py | |
| parent | cddfbe07749a44f83d0f8241fff7ca96a6631882 (diff) | |
| download | focaccia-qemu-33dc9914eac581dea9bdea35dcda4d542531d66a.tar.gz focaccia-qemu-33dc9914eac581dea9bdea35dcda4d542531d66a.zip | |
Revert series: virtiofsd: Announce submounts to the guest
This reverts the following commits due to their basis on a bogus
linux kernel header update:
c93a656f7b65 ("tests/acceptance: Add virtiofs_submounts.py")
45ced7ca2f27 ("tests/acceptance/boot_linux: Accept SSH pubkey")
08dce386e77e ("virtiofsd: Announce sub-mount points")
eba8b096c17c ("virtiofsd: Store every lo_inode's parent_dev")
ede24b6be798 ("virtiofsd: Add fuse_reply_attr_with_flags()")
e2577435d343 ("virtiofsd: Add attr_flags to fuse_entry_param")
2f10415abfc5 ("virtiofsd: Announce FUSE_ATTR_FLAGS")
97d741cc96dd ("linux/fuse.h: Pull in from Linux")
Cc: Max Reitz <mreitz@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 160385090886.20017.13382256442750027666.stgit@gimli.home
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/acceptance/boot_linux.py')
| -rw-r--r-- | tests/acceptance/boot_linux.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 1da4a53d6a..c743e231f4 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 download_cloudinit(self): self.log.info('Preparing cloudinit image') try: cloudinit_iso = os.path.join(self.workdir, 'cloudinit.iso') @@ -67,8 +67,7 @@ class BootLinuxBase(Test): password='password', # QEMU's hard coded usermode router address phone_home_host='10.0.2.2', - phone_home_port=self.phone_home_port, - authorized_key=ssh_pubkey) + phone_home_port=self.phone_home_port) except Exception: self.cancel('Failed to prepared cloudinit image') return cloudinit_iso @@ -81,19 +80,19 @@ class BootLinux(BootLinuxBase): timeout = 900 chksum = None - def setUp(self, ssh_pubkey=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(ssh_pubkey) + self.prepare_cloudinit() def prepare_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 prepare_cloudinit(self): + cloudinit_iso = self.download_cloudinit() self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso) def launch_and_wait(self): |