| Message ID | 1547805767-24863-2-git-send-email-lizhijian@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] Acceptance tests: use linux-3.6 and set vm memory to 4GiB | expand |
Sorry, there are some typos, please ignore this version i will correct in V2 s/v4.19/v4.16 on subject. On 1/18/19 18:02, Li Zhijian wrote: > timeout is updated to 5mins since we need more time to load a > large initrd to the guest > > CC: Wainer dos Santos Moschetta <wainersm@redhat.com> > CC: Caio Carrara <ccarrara@redhat.com> > CC: Cleber Rosa <crosa@redhat.com> > CC: Eduardo Habkost <ehabkost@redhat.com> > CC: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> > --- > tests/acceptance/linux_initrd.py | 37 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 36 insertions(+), 1 deletion(-) > > diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py > index aeb9fde..6f1ee1f 100644 > --- a/tests/acceptance/linux_initrd.py > +++ b/tests/acceptance/linux_initrd.py > @@ -8,6 +8,7 @@ > # This work is licensed under the terms of the GNU GPL, version 2 or > # later. See the COPYING file in the top-level directory. > > +import logging > import tempfile > from avocado.utils.process import run > > @@ -22,7 +23,7 @@ class LinuxInitrd(Test): > :avocado: tags=x86_64 > """ > > - timeout = 60 > + timeout = 300 > > def test_with_2gib_file_should_exit_error_msg_with_linux_v3_6(self): > """ > @@ -48,3 +49,37 @@ class LinuxInitrd(Test): > expected_msg = r'.*initrd is too large.*max: \d+, need %s.*' % ( > max_size + 1) > self.assertRegex(res.stderr_text, expected_msg) > + > + def test_with_2gib_file_should_work_with_linux_v4_18(self): s/v4_18/v4_16 Thanks > + """ > + since linux header introduced xloadflags which can tell bootloader > + whether initrd can be loaded into above 4G address. > + """ > + kernel_url = ('https://mirrors.kernel.org/fedora/releases/28/' > + 'Everything/x86_64/os/images/pxeboot/vmlinuz') > + kernel_hash = '238e083e114c48200f80d889f7e32eeb2793e02a' > + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > + max_size = 2 * (1024 ** 3) - 1 > + > + with tempfile.NamedTemporaryFile() as initrd: > + initrd.seek(max_size) > + initrd.write(b'\0') > + initrd.flush() > + > + self.vm.set_machine('pc') > + self.vm.set_console() > + kernel_command_line = 'console=ttyS0' > + self.vm.add_args('-kernel', kernel_path, > + '-append', kernel_command_line, > + '-initrd', initrd.name, > + '-m', '5120') > + self.vm.launch() > + console = self.vm.console_socket.makefile() > + console_logger = logging.getLogger('console') > + while True: > + msg = console.readline() > + console_logger.debug(msg.strip()) > + if 'Unpacking initramfs...' in msg: > + break > + if 'Kernel panic - not syncing' in msg: > + self.fail("Kernel panic reached")
diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py index aeb9fde..6f1ee1f 100644 --- a/tests/acceptance/linux_initrd.py +++ b/tests/acceptance/linux_initrd.py @@ -8,6 +8,7 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. +import logging import tempfile from avocado.utils.process import run @@ -22,7 +23,7 @@ class LinuxInitrd(Test): :avocado: tags=x86_64 """ - timeout = 60 + timeout = 300 def test_with_2gib_file_should_exit_error_msg_with_linux_v3_6(self): """ @@ -48,3 +49,37 @@ class LinuxInitrd(Test): expected_msg = r'.*initrd is too large.*max: \d+, need %s.*' % ( max_size + 1) self.assertRegex(res.stderr_text, expected_msg) + + def test_with_2gib_file_should_work_with_linux_v4_18(self): + """ + since linux header introduced xloadflags which can tell bootloader + whether initrd can be loaded into above 4G address. + """ + kernel_url = ('https://mirrors.kernel.org/fedora/releases/28/' + 'Everything/x86_64/os/images/pxeboot/vmlinuz') + kernel_hash = '238e083e114c48200f80d889f7e32eeb2793e02a' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + max_size = 2 * (1024 ** 3) - 1 + + with tempfile.NamedTemporaryFile() as initrd: + initrd.seek(max_size) + initrd.write(b'\0') + initrd.flush() + + self.vm.set_machine('pc') + self.vm.set_console() + kernel_command_line = 'console=ttyS0' + self.vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line, + '-initrd', initrd.name, + '-m', '5120') + self.vm.launch() + console = self.vm.console_socket.makefile() + console_logger = logging.getLogger('console') + while True: + msg = console.readline() + console_logger.debug(msg.strip()) + if 'Unpacking initramfs...' in msg: + break + if 'Kernel panic - not syncing' in msg: + self.fail("Kernel panic reached")
timeout is updated to 5mins since we need more time to load a large initrd to the guest CC: Wainer dos Santos Moschetta <wainersm@redhat.com> CC: Caio Carrara <ccarrara@redhat.com> CC: Cleber Rosa <crosa@redhat.com> CC: Eduardo Habkost <ehabkost@redhat.com> CC: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> --- tests/acceptance/linux_initrd.py | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)