| Message ID | 20191028073441.6448-16-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/acceptance: Queue for 4.2 | expand |
On Mon, Oct 28, 2019 at 08:34:30AM +0100, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > User case from: > https://mail.coreboot.org/pipermail/openbios/2018-May/010360.html > > Acked-by: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > v3: > - use avocado_qemu.wait_for_console_pattern (Cleber) > - use MD5 hash > --- Reviewed-by: Cleber Rosa <crosa@redhat.com> Tested-by: Cleber Rosa <crosa@redhat.com> Queuing on my python-next branch (and sending shortly in a PR). Thanks, - Cleber.
On Mon, Oct 28, 2019 at 02:41:51PM -0400, Cleber Rosa wrote: > On Mon, Oct 28, 2019 at 08:34:30AM +0100, Philippe Mathieu-Daudé wrote: > > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > > > User case from: > > https://mail.coreboot.org/pipermail/openbios/2018-May/010360.html > > > > Acked-by: David Gibson <david@gibson.dropbear.id.au> > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > --- > > v3: > > - use avocado_qemu.wait_for_console_pattern (Cleber) > > - use MD5 hash > > --- > > Reviewed-by: Cleber Rosa <crosa@redhat.com> > Tested-by: Cleber Rosa <crosa@redhat.com> > > Queuing on my python-next branch (and sending shortly in a PR). Even though this test runs fine on my local machine, it times out under Travis because the image is too large to be downloaded within the test timeout. For now, I'm adding: @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') The definitive solution is coming. Avocado master already allows one to run: $ avocado assets fetch tests/acceptance/boot_linux_console.py And have the assets downloaded *before* the test is executed. We're now adding a "pre_tests"[1] plugin, so that the download will be done automatically (and only for the tests in the current job). - Cleber. [1] - https://avocado-framework.readthedocs.io/en/72.0/api/core/avocado.core.html#avocado.core.plugin_interfaces.JobPreTests > > Thanks, > - Cleber.
diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py index ebde5b7dc4..b4109a7af3 100644 --- a/tests/acceptance/ppc_prep_40p.py +++ b/tests/acceptance/ppc_prep_40p.py @@ -69,3 +69,35 @@ class IbmPrep40pMachine(MachineTest): wait_for_console_pattern(self, fw_banner) prompt_msg = 'Type any key to interrupt automatic startup' wait_for_console_pattern(self, prompt_msg) + + def test_openbios_192m(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:40p + """ + self.vm.set_machine('40p') + self.vm.set_console() + self.vm.add_args('-m', '192') # test fw_cfg + + self.vm.launch() + wait_for_console_pattern(self, '>> OpenBIOS') + wait_for_console_pattern(self, '>> Memory: 192M') + wait_for_console_pattern(self, '>> CPU type PowerPC,604') + + def test_openbios_and_netbsd(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:40p + """ + drive_url = ('https://ftp.netbsd.org/pub/NetBSD/iso/7.1.2/' + 'NetBSD-7.1.2-prep.iso') + drive_hash = 'ac6fa2707d888b36d6fa64de6e7fe48e' + drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash, + algorithm='md5') + self.vm.set_machine('40p') + self.vm.set_console() + self.vm.add_args('-cdrom', drive_path, + '-boot', 'd') + + self.vm.launch() + wait_for_console_pattern(self, 'NetBSD/prep BOOT, Revision 1.9')