From patchwork Sat Oct 19 15:34:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200263 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D13B13B1 for ; Sat, 19 Oct 2019 15:38:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 28BAE2082C for ; Sat, 19 Oct 2019 15:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cw81oSOz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28BAE2082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqoe-0001rX-Vd for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:38:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47383) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkd-00055W-NM for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkc-0002pq-C8 for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:43 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:50667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkc-0002pV-6Y for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:42 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5so9006400wmg.0 for ; Sat, 19 Oct 2019 08:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w2ENnodrkebcANajyxBbU6bIiMWLNySDu9Cotb19W1w=; b=Cw81oSOzzEBQUH5EW/aAUmwqR36xwlk82kmdP0yq7Ylz+Q9ABr4ubw0/0tBGgA5//Q DwRH4se/WgrZ6qhXf0WdNPePBP8fr4uol0JS1l4q1UTaOd8w9sYSlaLeCmmastkXwS+k wJVd+h4VeeLxhv/Uf2hJulZn4M/u/WgnLd+CcaMEGT4nOXA6/+iyPIav8X2HpBycfPYs uktqzWzpQmFgAhUWJZktjFhADXcpICpbINZJTA5T+KH0dziOlzmqMhb7xmVaBC979E2Q UL3/qUogEyxwmpx3vRHVB8EUzakBj2ZQDS9tOoajEjZYrbl4xS9t5OXl8h2AMEMG7RKm f8jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=w2ENnodrkebcANajyxBbU6bIiMWLNySDu9Cotb19W1w=; b=IxchB3Kc0ZgHz+8ZcmfPA94W7z/Q7hZumIRY/esXh2oldeGWm2qwvuWHjKGhilKDmI h6hQJmLR6xD4vlEDkl3Rdgc7066Wahtv6ShKatJAfxiCDHT/OTavhPbumUZuZdBJUDVs eJjrMmqoIr0VGu06l7OxZCPfYmC+jX3qxogVwpel1A5JEPqLJpgYb39Hdoaq0K2yy5RG 2sNhIslN/Zs55L97qZ1nbyJTEpJjWqXGS+wk02PribOuKIavq55kQdEIAcoUmjBBeygH NIRY4J403sBKz9U7XfIGf5w2l8jPVm39zLgnjLj1d6Ymio37tnQDuehV20Bh6JqUuy6U wU6w== X-Gm-Message-State: APjAAAXASdywt52+stoD5TWHkbXucjzfPsKejinhhlvNF1BrRNWy6kHp aiox+KUxb/cVvNP6kMMA1SJ2bU61 X-Google-Smtp-Source: APXvYqzUGcUrLWG/sUVD5FtqWCWpTRBRa8kN+Rjw5+n4alzea1xRfvYhqWGIM2Ej5UKxgu2WG4xJ9w== X-Received: by 2002:a1c:2884:: with SMTP id o126mr13047674wmo.153.1571499280953; Sat, 19 Oct 2019 08:34:40 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/11] Acceptance tests: refactor wait_for_console_pattern Date: Sat, 19 Oct 2019 17:34:27 +0200 Message-Id: <20191019153437.9820-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa The same utility method is already present in two different test files, so let's consolidate it into a single utility function. Signed-off-by: Cleber Rosa Message-Id: <20190916164011.7653-1-crosa@redhat.com> Reviewed-by: Philippe Mathieu-Daudé [PMD: failure_message is optional] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- tests/acceptance/avocado_qemu/__init__.py | 25 +++++++++++++++++++++ tests/acceptance/boot_linux_console.py | 27 +++++------------------ tests/acceptance/linux_ssh_mips_malta.py | 18 +++------------ 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index bd41e0443c..e3101cba30 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.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 os import sys import uuid @@ -53,6 +54,30 @@ def pick_default_qemu_bin(arch=None): return qemu_bin_from_src_dir_path +def wait_for_console_pattern(test, success_message, failure_message=None): + """ + Waits for messages to appear on the console, while logging the content + + :param test: an Avocado test containing a VM that will have its console + read and probed for a success or failure message + :type test: :class:`avocado_qemu.Test` + :param success_message: if this message appears, test succeeds + :param failure_message: if this message appears, test fails + """ + console = test.vm.console_socket.makefile() + console_logger = logging.getLogger('console') + while True: + msg = console.readline().strip() + if not msg: + continue + console_logger.debug(msg) + if success_message in msg: + break + if failure_message and failure_message in msg: + fail = 'Failure message found in console: %s' % failure_message + test.fail(fail) + + class Test(avocado.Test): def setUp(self): self._vms = {} diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 8a9a314ab4..8897e0c253 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -9,12 +9,12 @@ # later. See the COPYING file in the top-level directory. import os -import logging import lzma import gzip import shutil from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive @@ -29,31 +29,14 @@ class BootLinuxConsole(Test): KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' - def wait_for_console_pattern(self, success_message, - failure_message='Kernel panic - not syncing'): - """ - Waits for messages to appear on the console, while logging the content - - :param success_message: if this message appears, test succeeds - :param failure_message: if this message appears, test fails - """ - console = self.vm.console_socket.makefile() - console_logger = logging.getLogger('console') - while True: - msg = console.readline().strip() - if not msg: - continue - console_logger.debug(msg) - if success_message in msg: - break - if failure_message in msg: - fail = 'Failure message found in console: %s' % failure_message - self.fail(fail) + def wait_for_console_pattern(self, success_message): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing') def exec_command_and_wait_for_pattern(self, command, success_message): command += '\n' self.vm.console_socket.sendall(command.encode()) - self.wait_for_console_pattern(success_message) + wait_for_console_pattern(self, success_message) def extract_from_deb(self, deb, path): """ diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index 25a1df5098..ffbb06f846 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -13,6 +13,7 @@ import time from avocado import skipUnless from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive from avocado.utils import ssh @@ -40,19 +41,6 @@ class LinuxSSH(Test): def setUp(self): super(LinuxSSH, self).setUp() - def wait_for_console_pattern(self, success_message, - failure_message='Oops'): - console = self.vm.console_socket.makefile() - console_logger = logging.getLogger('console') - while True: - msg = console.readline() - console_logger.debug(msg.strip()) - if success_message in msg: - break - if failure_message in msg: - fail = 'Failure message found in console: %s' % failure_message - self.fail(fail) - def get_portfwd(self): res = self.vm.command('human-monitor-command', command_line='info usernet') @@ -109,7 +97,7 @@ class LinuxSSH(Test): self.log.info('VM launched, waiting for sshd') console_pattern = 'Starting OpenBSD Secure Shell server: sshd' - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern, 'Oops') self.log.info('sshd ready') self.ssh_connect('root', 'root') @@ -117,7 +105,7 @@ class LinuxSSH(Test): def shutdown_via_ssh(self): self.ssh_command('poweroff') self.ssh_disconnect_vm() - self.wait_for_console_pattern('Power down') + wait_for_console_pattern(self, 'Power down', 'Oops') def ssh_command_output_contains(self, cmd, exp): stdout, _ = self.ssh_command(cmd) From patchwork Sat Oct 19 15:34:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200257 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2FB91951 for ; Sat, 19 Oct 2019 15:36:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8861F2064B for ; Sat, 19 Oct 2019 15:36:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XFEWVP/a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8861F2064B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqmD-0006q0-E9 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:36:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47392) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqke-00055l-DA for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkd-0002qe-Gj for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:44 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54746) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkd-0002pw-BR for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:43 -0400 Received: by mail-wm1-x344.google.com with SMTP id p7so8995157wmp.4 for ; Sat, 19 Oct 2019 08:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZIx2URSbhQtQxwSH9NicQbjsqcplkfjt7F3Xbrr+u4U=; b=XFEWVP/aGFnw1NRLaBU5ieydfRPYUDIBZnQCoZK/eHOgndNaAgrrWSGtYh8iiDMMXd KD9sKkj4vcURgi+xhF8hOUbIN5YwnPenvspkS00tiglxScflGpi9rwtdHMqnyj0KieSq P5IVRE0AURS8eKXk2ORcAqmgat7xxwzoO8bEktQZNa5BzHuLqdLRgOaDFlA3QX1Q1BCb Oec/z49Vo2IXxwQSmBeZRKZGtY/4mOgDIvQekY/kBjA9sUmLDySUx0rfbcKjvU4APgx2 sBt53Ij/tqpUx6BQirdcIrNmaSeFgPlDBPHw9YT/40KDy9X5e9fKskg4HgIx1aK0+4Os YtyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZIx2URSbhQtQxwSH9NicQbjsqcplkfjt7F3Xbrr+u4U=; b=Bb1gHgxgTD9bcUtr3bKtK8aBlTyqFkp3CGV5GXWFY55N1ibS5TQtRnuyz2ITRpdGDh gOQn3R/hLXzd8zyMrUdJui0v9ST9wUeKKUYP+tUjU9ArJ+YIweO4Y1zrZNkYg59aaU0j FELKOO3cMB5YCxbbp0Hc517AxkOrFmSZn3bW8bHO23BCZmoqFUagTjjrGEApF1Ywcdvs JSTvFpqp6yLIKq69VUl52velE8DZgiOkggpf55DThzqko1KAdv629bOHTNclyohUzsGB sclkmkQ5/UcH+VbWukytbFickF6oauBVYwv/W26q9IuAfRE+vdTN3UHvQXHD2DkQ3vP9 93TA== X-Gm-Message-State: APjAAAWcAR5xzhgjCm5KDoBhOb3Ux9arZFnC3fRLvJz7qDfRn4a16gFo DeGfKj/le/KMRil3pP7FcrVWU/DX X-Google-Smtp-Source: APXvYqx0mDth76RRWkA7GiYHDReRfYQ2zS2m3hxNJCtJiIDRdd5IVEKWy9RwxV3B8xuGNYnpSzh48w== X-Received: by 2002:a05:600c:2212:: with SMTP id z18mr12985024wml.154.1571499282193; Sat, 19 Oct 2019 08:34:42 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/11] tests/acceptance: Fixe wait_for_console_pattern() hangs Date: Sat, 19 Oct 2019 17:34:28 +0200 Message-Id: <20191019153437.9820-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Because of a possible deadlock (QEMU waiting for the socket to become writable) let's close the console socket as soon as we stop to use it. Suggested-by: Cleber Rosa Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- tests/acceptance/avocado_qemu/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index e3101cba30..a0450e5263 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -74,6 +74,7 @@ def wait_for_console_pattern(test, success_message, failure_message=None): if success_message in msg: break if failure_message and failure_message in msg: + console.close() fail = 'Failure message found in console: %s' % failure_message test.fail(fail) From patchwork Sat Oct 19 15:34:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200265 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A88B17EE for ; Sat, 19 Oct 2019 15:38:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E50172082C for ; Sat, 19 Oct 2019 15:38:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VbTWNm05" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E50172082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqoj-0001yn-Ge for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47411) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkf-000574-KQ for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqke-0002rP-Kl for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:45 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:37052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqke-0002qp-Fb for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:44 -0400 Received: by mail-wm1-x331.google.com with SMTP id f22so8753614wmc.2 for ; Sat, 19 Oct 2019 08:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L17Gkpekc5/KDSlV7uWJjFxc0f5cH+nD4BY7UX0P8ME=; b=VbTWNm05GGkKArp4LyU8HhBqRSYshuND0h/tYWWOaIjlduqCpKuT2IUsXog4FnzL99 V30OCecJAZcENWPydi53HJxNlyfKfOJmpmkWZabu840F9p0wxDRkndXAGyZPz4seuWCf sM94HiFCm9iJ0Z+epzzGB/aVH3q/hFPXS20hOLRSuqrz1D1RCV/ni3eDmQ4/XqAw3XjH BI+Oz69jAHHYTXz8qGNzy7gUg+msOP1kJLyYT+SDSC5cOIV0Zy9JyY43GQosK2I8r7j5 5dlyT0KSW9MuUV0k3ifrUYky3bS0Bw4OpVwmeHksMk4wP/pWaOiPIfUqoE5G/NLBiXEF VaQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=L17Gkpekc5/KDSlV7uWJjFxc0f5cH+nD4BY7UX0P8ME=; b=Nwt2E5gYlA+QP3glKt7RulyrweEZEIUuPvEBJ7657gdLEyNa51Hx7b2QCx+TlZYK+o Z13znp14EQBZCtAWugKRa3yna3zjQMN9kF9E41KONZA2/Bek3vgrU/GyCk/LkXMITYG4 Tg+cWz4+PX8oClzyn/QIarX6ShH24W7eaZbxr3eryzdLHTY9s+zVOcOH+defefH55CT7 ZiRwb/97lCG5+nDyZ8Mo08SIS+7+MaWGXNxvlIU2iRCXWYvnlfYg55FaKJqUsC+65eQO Pr/q2eazpl7DA+sORMHh2UD9AN44PyMqM3svI3GLslpp1AoBsa6UEHRp79sV/h8KdJ2K iVnw== X-Gm-Message-State: APjAAAVO3bTfikvxfwufaCABgeuE/XJgTaGmVtcipgMdeu9uslJxW7u7 scCjI+iCI8yDA6qAwffJQgiiaHdD X-Google-Smtp-Source: APXvYqzYa7pnmv62Bdo1K0pV/nZLzv+TqHN89ETx0czpXxYGJeTnD52UVxty1+nM8PYr5tm9KZOUYQ== X-Received: by 2002:a1c:99d5:: with SMTP id b204mr7051001wme.64.1571499283337; Sat, 19 Oct 2019 08:34:43 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/11] tests/acceptance: Send on serial lines Date: Sat, 19 Oct 2019 17:34:29 +0200 Message-Id: <20191019153437.9820-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Some firmwares don't parse the control character and expect a . Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/boot_linux_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 8897e0c253..497faa4f7f 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -34,7 +34,7 @@ class BootLinuxConsole(Test): failure_message='Kernel panic - not syncing') def exec_command_and_wait_for_pattern(self, command, success_message): - command += '\n' + command += '\r\n' self.vm.console_socket.sendall(command.encode()) wait_for_console_pattern(self, success_message) From patchwork Sat Oct 19 15:34:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200259 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 641E313B1 for ; Sat, 19 Oct 2019 15:36:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3A4192082C for ; Sat, 19 Oct 2019 15:36:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eL91lvr1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A4192082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqmL-0006zK-4z for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:36:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47423) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkh-00059L-Do for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkg-0002sB-2s for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:47 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37054) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkf-0002rw-Ti for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:46 -0400 Received: by mail-wm1-x333.google.com with SMTP id f22so8753641wmc.2 for ; Sat, 19 Oct 2019 08:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l2a+TCqZPYf8Fdku0JFcZTliUzkB7c4m1IgL3Bv67Zg=; b=eL91lvr1o7Kg+wOKDN8X3IJ7Xkcx4yhEg7uXfWnOxQ4ySTyO1IpVxhXqBnIOfWhy+t rBa+kChJMwlryj8epNZFktmaCS2QcNwUTVwZR9jb0joc30ULEFKSYY4r0CMf41+XUltM BvShJYu6lRUGVVVUwj9elHaJxBID/bgfw6JgDR3Omo9STh7NhWy6pz3+MfeTQkHKpC5Z FDA7vCjGkSvDwfqvkqRTHaLNfpVy9lY+rlkb64lfIQeu/eZBQXTGoPy5y7nxoWRlSrrx 6Q8bGvEQFdzkoLowLkNX/8OuWxGRh2x+iZYA4MlEVOvhsqbLUyiNzqzeBNNlqgjjOGf9 8ALA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=l2a+TCqZPYf8Fdku0JFcZTliUzkB7c4m1IgL3Bv67Zg=; b=TsAeFRbTiHQSVjVt1wfko3avXLYUbbrjALcgC4OQmp3WoiRL0IBjYl4s6Xxnf2idi2 5l+/6iE7wQ0YS8zu6k15Hz9B6K++jdT6r6ooVv8njDrX9cqLeMr1hxDkvxRAeLmCIAlV aTDevAtrVb9NIilo1cxNsIqnB1qVduJLbA7Q8ln4zVUi0wetOjKHYooCAsOpp1uM3XKF ZErRFOgzEOrLls1NjgwJhXQ/FuNZiEr1VuY++6OaZOcuS+PqYi0dfF7wnFDslesbVEYZ iUQINz349Tx90NTdwz1BLmb4L0T8xZQkz1zilTbpyf2aNJviOvMjpdlVbeRDlsu9ZaNT kEAw== X-Gm-Message-State: APjAAAXvL7gbKOP9kAJOkYum7pHtUbHmpDxGejptMNvxq893joFdoRvQ q2wKIjt186xo7zQtQ082f0pAfuco X-Google-Smtp-Source: APXvYqxFnHkP56/IBULT5vzXpkrkh6hmUd7Rs0z883K54SntiBLeB1rb6f5NmeaIMaBgh9KYIpJTPQ== X-Received: by 2002:a1c:5946:: with SMTP id n67mr12569560wmb.93.1571499284716; Sat, 19 Oct 2019 08:34:44 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/11] tests/acceptance: Refactor exec_command_and_wait_for_pattern() Date: Sat, 19 Oct 2019 17:34:30 +0200 Message-Id: <20191019153437.9820-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The same utility method is already present in two different test files, so let's consolidate it into a single utility function. Signed-off-by: Philippe Mathieu-Daudé --- v2: fix self -> test, failure_message is optional, added doc --- tests/acceptance/avocado_qemu/__init__.py | 19 +++++++++++++++++++ tests/acceptance/boot_linux_console.py | 18 +++++++----------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index a0450e5263..7bc77118dd 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -79,6 +79,25 @@ def wait_for_console_pattern(test, success_message, failure_message=None): test.fail(fail) +def exec_command_and_wait_for_pattern(test, command, + success_message, failure_message=None): + """ + Send a command to a console (appending CRLF characters), then wait + for success_message to appear on the console, while logging the. + content. Mark the test as failed if failure_message is found instead. + + :param test: an Avocado test containing a VM that will have its console + read and probed for a success or failure message + :type test: :class:`avocado_qemu.Test` + :param command: the command to send + :param success_message: if this message appears, test succeeds + :param failure_message: if this message appears, test fails + """ + command += '\r\n' + test.vm.console_socket.sendall(command.encode()) + wait_for_console_pattern(test, success_message, failure_message) + + class Test(avocado.Test): def setUp(self): self._vms = {} diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 497faa4f7f..4b419b0559 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -14,6 +14,7 @@ import gzip import shutil from avocado_qemu import Test +from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive @@ -33,11 +34,6 @@ class BootLinuxConsole(Test): wait_for_console_pattern(self, success_message, failure_message='Kernel panic - not syncing') - def exec_command_and_wait_for_pattern(self, command, success_message): - command += '\r\n' - self.vm.console_socket.sendall(command.encode()) - wait_for_console_pattern(self, success_message) - def extract_from_deb(self, deb, path): """ Extracts a file from a deb package into the test workdir @@ -166,12 +162,12 @@ class BootLinuxConsole(Test): self.vm.launch() self.wait_for_console_pattern('Boot successful.') - self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo', - 'BogoMIPS') - self.exec_command_and_wait_for_pattern('uname -a', - 'Debian') - self.exec_command_and_wait_for_pattern('reboot', - 'reboot: Restarting system') + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'BogoMIPS') + exec_command_and_wait_for_pattern(self, 'uname -a', + 'Debian') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system') def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) From patchwork Sat Oct 19 15:34:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200271 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F341D17EE for ; Sat, 19 Oct 2019 15:41:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0B2520854 for ; Sat, 19 Oct 2019 15:41:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X78yY+/F" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0B2520854 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqrb-0005XD-Pi for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:41:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47433) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqki-0005Bd-Pn for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkh-0002sz-BD for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:48 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:50672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkh-0002sY-5d for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:47 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5so9006499wmg.0 for ; Sat, 19 Oct 2019 08:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sj0gWaKf7F1u1yqYOnBP1Je+BdxFG+7SDe9DUcADRaE=; b=X78yY+/FiWu/vOU/BzjaO1Lj3RdJ6U4spA9vfenAsWU+tEHPNheaHkma1GV9ZUftw5 DKuy8vaqNGR7TMTc5MwYjiHN07QJHF/TM4QrYKB1JBHZPhQEYEAlETU3fQv62ajMOs4f zP3U1Pq8N8/Vevx8PmyCllsle2Ij3OPHJONTgoF6yi0gnq3kbWrDQRg5CLYFzTScsh09 EbYzpOwrSINsXEunu+wGx1I0bQLXivOR/51AWqdjttC3DmSiV3k9ZBW5wUSCdgfFoKun v/b/b16r87NUmsdqnaLM7EX/ypsG2AN1YcXHZhnS8ICV8SudvHYWNuCSid29hj7SiWRV nsRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sj0gWaKf7F1u1yqYOnBP1Je+BdxFG+7SDe9DUcADRaE=; b=l+fOrMiiRQP6UuB2KVykhdYcdSmBbtV/kTlYWRcGBXHhu4ElcGN2eDtYeSVan6G/1K f0oI9RuSOsgiLbObKWBzGOMjZ8+GAaPTBk6swywRLP2/AGsCykM2Y2of5BY3VCeKOYxX OB99D68jsewv8zSQTBJvRfprMoyYajCP4iMs5Y2QaZ6ztDEipnWVd7Ob1zDjxtEpmQN3 kRWA9pmnWdmYSqrAaybXH0iK/e4DbGDiXsHmnSnlsKy9IzR80Y6ZjiaoxWqr5kw89QX8 YKMK9EcKBI3rJSt74oSk1Ye9Ue2MZEovO3q1H35RCfjjGeTNnON6iBoYiCRJsKgrKAlT TuiA== X-Gm-Message-State: APjAAAWeYKPD/lWUwpHuGsumFEUMcC4BhDx3MyetN75wCtPSnoP/ppPy nx/xuhIrknu13+x+dtL/nnirr2o8 X-Google-Smtp-Source: APXvYqylPMfVMJ+dH0bEqzzD4kSX+qnclFbot7J8nW0lPj4HKPmFofkyBC3JHgnV17tPzoCDTh+TuA== X-Received: by 2002:a7b:cf0e:: with SMTP id l14mr12368753wmg.46.1571499286024; Sat, 19 Oct 2019 08:34:46 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/11] tests/boot_linux_console: Use Avocado archive::gzip_uncompress() Date: Sat, 19 Oct 2019 17:34:31 +0200 Message-Id: <20191019153437.9820-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Avocado 67.0 [*] introduced the avocado.utils.archive module which provides handling of gzip files. Use the gzip_uncompress() method. [*] https://avocado-framework.readthedocs.io/en/67.0/api/utils/avocado.utils.html#avocado.utils.archive.gzip_uncompress Suggested-by: Cleber Rosa Signed-off-by: Philippe Mathieu-Daudé --- v2: New patch replacing the gunzip() refactor --- tests/acceptance/boot_linux_console.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 4b419b0559..67d7e96d98 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -145,10 +145,7 @@ class BootLinuxConsole(Test): initrd_hash = 'bf806e17009360a866bf537f6de66590de349a99' initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash) initrd_path = self.workdir + "rootfs.cpio" - - with gzip.open(initrd_path_gz, 'rb') as f_in: - with open(initrd_path, 'wb') as f_out: - shutil.copyfileobj(f_in, f_out) + archive.gzip_uncompress(initrd_path_gz, initrd_path) self.vm.set_machine('malta') self.vm.set_console() From patchwork Sat Oct 19 15:34:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200261 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A41613B1 for ; Sat, 19 Oct 2019 15:36:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 10B782082C for ; Sat, 19 Oct 2019 15:36:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HJ+3sZ1o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10B782082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqmO-00075O-MJ for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:36:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47449) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkk-0005Dw-9u for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqki-0002tw-O9 for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:50 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38281) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqki-0002tM-I1 for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:48 -0400 Received: by mail-wr1-x444.google.com with SMTP id o15so8802102wru.5 for ; Sat, 19 Oct 2019 08:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QBTrUBOd5GMcqdYIUb+wluk81oA9TycjHbQQeiTj8kE=; b=HJ+3sZ1oqiasnuOlFbQYJCm9vU7tr816YZcAElZMG8QWhN8KGivj3wTWxrMbCJqw4C fXMKcyFXKe5h/zWocjQISFxBD2TQ0GLSocZ2+tJpvpK0u+lcN2Ml/QSROuVCSc5lOXng VSvmTPibf6sk9l52Avjyw1kwIscSH3qeLXCfp58RjdjrUvI44z9ar62fQ2AlrDLgA1vK g4l2VRhaFUqMLkz8B/Y3aFivWNko4kPFtlJV2LWSG4ZPnfDV/aqlDTsryaHkqqqVwrCf IBK94o2Yf+sZfQ7+cdmLqtPNEXR1WN4+1yzPoJ6v7Ezkkhc+x2TR8iQVZQhN4Vgn6Zd4 9k7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QBTrUBOd5GMcqdYIUb+wluk81oA9TycjHbQQeiTj8kE=; b=GzpPfUJfoz5tEvJgy7CnB7jg70EaGhYsIB1JwrslZMKUh7CoWfcwQ9xz6glg1kpEte YhJUsz0a14IGD/4FDOIpW1s9gHAewuse1O2w5nkb5ZOw3aeKFvFDhZhqusmfX1nzdo25 fJGKB1elCJ7zo6ENHunBPlntO2L1g8HfkiZCIzH+GG9hSULkhfIBg9rMhqcsAf2AHFKK JmH7AksWG1TLGbDcAivEpXANI0R3su04/1R2w7XAtW/jODeltvczCo2o47sQMwItRLOW +9jioAi7x9eUzKh4l3xA8hcFCfEFBxPc5Cv1DFVplp4qClozj9kGIVY6/BUpejf2N9aA TZcQ== X-Gm-Message-State: APjAAAWZmGQQjaJcw9YiGrV+dzp2Dtmy44Z3SXuHswszW9ZvNsSucY2k leQfwFUKVdbNyOOTVRwk1NQMVeFw X-Google-Smtp-Source: APXvYqzr+mfdeupUQVZggAj7YHBlI7jj3pw790Jy08IvYdI3zHfb4kojZ+hWNL9zUELiSdaiog+SoA== X-Received: by 2002:adf:a54e:: with SMTP id j14mr9859289wrb.265.1571499287173; Sat, 19 Oct 2019 08:34:47 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/11] tests/boot_linux_console: Run BusyBox on 5KEc 64-bit cpu Date: Sat, 19 Oct 2019 17:34:32 +0200 Message-Id: <20191019153437.9820-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This tests boots a Linux kernel on a Malta machine up to a busybox shell on the serial console. Few commands are executed before halting the machine (via reboot). We use the Fedora 24 kernel extracted from the image at: https://fedoraproject.org/wiki/Architectures/MIPS and the initrd cpio image from the kerneltests project: https://kerneltests.org/ If MIPS is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:mips" tags. Alternatively, this test can be run using: $ avocado --show=console run -t arch:mips64el tests/acceptance/boot_linux_console.py console: [ 0.000000] Linux version 3.19.3.mtoman.20150408 (mtoman@debian-co3-1) (gcc version 5.0.0 20150316 (Red Hat 5.0.0-0.20) (GCC) ) #3 Wed Apr 8 14:32:50 UTC 2015 console: [ 0.000000] Early serial console at I/O port 0x3f8 (options '38400n8') console: [ 0.000000] bootconsole [uart0] enabled console: [ 0.000000] CPU0 revision is: 00018900 (MIPS 5KE) console: [ 0.000000] Checking for the multiply/shift bug... no. console: [ 0.000000] Checking for the daddiu bug... no. [...] console: Boot successful. console: cat /proc/cpuinfo console: / # cat /proc/cpuinfo console: system type : MIPS Malta console: machine : Unknown console: processor : 0 console: cpu model : MIPS 5KE V0.0 console: : 1616.89 console: wait instruction : nouname -a console: microsecond timers : yes console: tlb_entries : 32 console: extra interrupt vector : yes console: hardware watchpoint : yes, count: 1, address/irw mask: [0x0ff8] console: isa : mips1 mips2 mips3 mips4 mips5 mips32r1 mips32r2 mips64r1 mips64r2 console: ASEs implemented : console: shadow register sets : 1 console: kscratch registers : 0 console: package : 0 console: core : 0 console: VCED exceptions : not available console: VCEI exceptions : not available console: / # console: / # uname -a console: Linux buildroot 3.19.3.mtoman.20150408 #3 Wed Apr 8 14:32:50 UTC 2015 mips64 GNU/Linux console: reboot console: / # console: / # reboot console: / # console: / # reboot: Restarting system PASS (7.04 s) JOB TIME : 7.20 s Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/boot_linux_console.py | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 67d7e96d98..e505a41eed 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -166,6 +166,46 @@ class BootLinuxConsole(Test): exec_command_and_wait_for_pattern(self, 'reboot', 'reboot: Restarting system') + def test_mips64el_malta_5KEc_cpio(self): + """ + :avocado: tags=arch:mips64el + :avocado: tags=machine:malta + :avocado: tags=endian:little + """ + kernel_url = ('https://github.com/philmd/qemu-testing-blob/' + 'raw/9ad2df38/mips/malta/mips64el/' + 'vmlinux-3.19.3.mtoman.20150408') + kernel_hash = '00d1d268fb9f7d8beda1de6bebcc46e884d71754' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + initrd_url = ('https://github.com/groeck/linux-build-test/' + 'raw/8584a59e/rootfs/' + 'mipsel64/rootfs.mipsel64r1.cpio.gz') + initrd_hash = '1dbb8a396e916847325284dbe2151167' + initrd_path_gz = self.fetch_asset(initrd_url, algorithm='md5', + asset_hash=initrd_hash) + initrd_path = self.workdir + "rootfs.cpio" + archive.gzip_uncompress(initrd_path_gz, initrd_path) + + self.vm.set_machine('malta') + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyS0 console=tty ' + + 'rdinit=/sbin/init noreboot') + self.vm.add_args('-cpu', '5KEc', + '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + wait_for_console_pattern(self, 'Boot successful.') + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'MIPS 5KE') + exec_command_and_wait_for_pattern(self, 'uname -a', + '3.19.3.mtoman.20150408') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system') + def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) kernel_path = self.workdir + "kernel" From patchwork Sat Oct 19 15:34:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200267 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D992B17EE for ; Sat, 19 Oct 2019 15:39:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B07572082C for ; Sat, 19 Oct 2019 15:39:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pNAwN7yy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B07572082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqor-0002C1-GL for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:39:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47452) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkk-0005EW-Mf for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkj-0002uX-NY for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:50 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:52804) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkj-0002u4-IA for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:49 -0400 Received: by mail-wm1-x32e.google.com with SMTP id r19so8997295wmh.2 for ; Sat, 19 Oct 2019 08:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8KsmRbilP8bTZKqxOfgUbDMH68hI/j6t6Vn/sO5YZF0=; b=pNAwN7yyrstS/boNbk4++Hs+1ZQFnDplZvfIvtZIVp2oNcGpd4OmgKJl5EumyJEpjU ysN+z+4Lu7rML0t3EKK2OqoBvrQJNsYxOLUupnN6C6XoEV5i++OSP128RnpWH0EkhwpV DF7gfgFfWmG/H6qY2yfQw47D5dXk8FJo4cbl5Ol8vFeDNoUTQaB62GnKhA+E5MWHPmED irLj5UDu1uS8NfrCDK3aqd51q41C0Y8Dn6ipXc28g1cOaAOhAVuMTUWQGThkV0MGD+Oz Db2IcQWp6/7ufLrkZ1Mxq3JBDcXkC7PGMw+CC/ROEtrLqMRGtfKK5k7/87fL0q2W5m8C Nj4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8KsmRbilP8bTZKqxOfgUbDMH68hI/j6t6Vn/sO5YZF0=; b=U8AO9GkKAsI8LvRMA+txONIj3/Zj9qphOhdBE7JKlvlj6hE5+KL/VKselUPuMqlWZV CN+HC48US+mnNpNDlB6tVaSBZOaFWgv5xJ3LMtu5wrBfeIKQZflZlP1GxJPq9R0J//N+ fD5UTKQ6ANhQttFydoWWUecIHB57hl2u0nzyS2NH1URUhmcQBZDvUiQ1GQ9R2jXRvOeX qtcgICArAQ29S9NmJBQ9ygoGgPcQxTaGFtDosVQ6vx8Axds0WlIZGETJXR4OCCLzMgJ0 WiqQErbQziFCvgCh5jt7LhdKV6ApotL6UxdSnO0k4Mq0P3L6OVBygmSJPDnNQBqZHOMK 1osA== X-Gm-Message-State: APjAAAV7xBErGM8k+N5PRt+BVGxRly0fZ96rT6kJRPyzuKo162bRApfQ bSQ4gQ+OYJ196ahanZWhl9FWcpGN X-Google-Smtp-Source: APXvYqy3khOTnsGP6oa2a0x5SEIh8lc5JDHT7wIzh4GtqT+r0K/IanbXXqIxCqkzSamUYOZ8RF4Lqw== X-Received: by 2002:a05:600c:2196:: with SMTP id e22mr8283882wme.1.1571499288505; Sat, 19 Oct 2019 08:34:48 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/11] tests/ssh_linux_malta: Run tests using a snapshot image Date: Sat, 19 Oct 2019 17:34:33 +0200 Message-Id: <20191019153437.9820-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" If a test fails, it can corrupt the underlying QCow2 image, making further tests failing. Fix this by running each test with a snapshot. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- tests/acceptance/linux_ssh_mips_malta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index ffbb06f846..27907e8fbd 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -90,7 +90,7 @@ class LinuxSSH(Test): self.vm.add_args('-no-reboot', '-kernel', kernel_path, '-append', kernel_command_line, - '-hda', image_path, + '-drive', 'file=%s,snapshot=on' % image_path, '-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22', '-device', 'pcnet,netdev=vnet') self.vm.launch() From patchwork Sat Oct 19 15:34:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200273 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0AE313B1 for ; Sat, 19 Oct 2019 15:42:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A732220854 for ; Sat, 19 Oct 2019 15:42:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iDUCYG0H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A732220854 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqrj-0005hj-Ob for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:42:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47461) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkl-0005FO-Po for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkk-0002vE-UZ for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:51 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33838) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkk-0002ue-PC for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:50 -0400 Received: by mail-wr1-x429.google.com with SMTP id t16so4098249wrr.1 for ; Sat, 19 Oct 2019 08:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TPCN4WzRP9NgdoqPPa5MaOK6LcXOEN/F7yGRSMuex64=; b=iDUCYG0HBFIrl9z6+Tn9dOLjMVypliSGEhIg6ZV1UedvGmX0MTw3fcw3z3Uy+3kkuW C0DsH9lQ26d+snHCskPFPRdvGYdtRLfBf7/+iEJdSKNitG9SEAsEmvaYHqnZFBECdYLz ZCCgQrsjoGm4qwjO+g5lOeFK3eMW/FbXPOJxr2QjIkAp5+5Hg9sThb/dXoJMXRc32gSS Muw5OztJiQUV+i0xwUMtBA7/vEU3KSmH4oK/RSXtRC2pgBQWsM+6o/efwMbbhq0Dia9d hZ+l8maVuck9/NEKtSg2MOj2kfBlGVbpQh3cYMj+jGMpB1P2F5bjnDgDxFU/B6+x9IVo 43kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TPCN4WzRP9NgdoqPPa5MaOK6LcXOEN/F7yGRSMuex64=; b=ByukUcQWypHXI/s8GeAkF41HzqMdOssG8xZaMkhQXMtZokP6i9PEZ78lHIDeYpA6HY 1Bb66U6ucj6L+4l2K9haZV3fxvlWTIO9BVEI5n7uCoGMy6w3RR3/BDfCfFZ2ZoEUBv4t Y7BBhHE2UEZ+gPxbbxtXddqF31m1ocYSFC4LeYBqMjv0nsPIlgxcuMmJYgERiMJqR32s vPjsczkayqdv7bcLcoiuFXqWUe1t+wLFVa7rkMAjq0UwEpHvkf8SehCu+gyIpkXp5e1c i3dsT6rxX3PkTbKkcwlMLJhraT0Cvt1hYx3WTdS6h7u3ptiBmzvaxz14v0R64rMr4cOM zJ5g== X-Gm-Message-State: APjAAAWDR2YcaUv51Oh+sOVOxPExYttHDuvyTUJS2KCZQ8QYNY16hc3c PtBhGuBLx7eLs1Fj14x3SAvDbZ9R X-Google-Smtp-Source: APXvYqzzvGYGHVrIJKUk6NIx1g8IHytGpnlmQPJtH2f8s9YCTiG07fRcMkTniPIcpOHtngdXjvifWQ== X-Received: by 2002:a5d:5704:: with SMTP id a4mr11078654wrv.281.1571499289652; Sat, 19 Oct 2019 08:34:49 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/11] tests/ssh_linux_malta: Remove duplicated test Date: Sat, 19 Oct 2019 17:34:34 +0200 Message-Id: <20191019153437.9820-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Remove duplicated test (probably copy/paste error in commit 9090d3332cdcc). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- tests/acceptance/linux_ssh_mips_malta.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index 27907e8fbd..5523ae2144 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -140,9 +140,6 @@ class LinuxSSH(Test): self.ssh_command_output_contains( 'cat /proc/interrupts', 'eth0') - self.ssh_command_output_contains( - 'cat /proc/interrupts', - 'eth0') self.ssh_command_output_contains( 'cat /proc/devices', 'input') From patchwork Sat Oct 19 15:34:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200277 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBD0213B1 for ; Sat, 19 Oct 2019 15:44:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A74D420854 for ; Sat, 19 Oct 2019 15:44:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ouZSdtQK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A74D420854 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqtz-0007ya-RP for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:44:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47478) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkn-0005HW-5H for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkm-0002vk-2Z for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:53 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkl-0002vV-TM for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:52 -0400 Received: by mail-wm1-x344.google.com with SMTP id i16so8990327wmd.3 for ; Sat, 19 Oct 2019 08:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V7O/r4jTySGSLTjP6nvBKNHUVX0/r7KaAP+5isYafiU=; b=ouZSdtQKJgmrGz89nYnPMLYt4p60qNxSQ6Kx2+kHPwf5scsR6fllbB9pQF6tF8TyX8 e77groz5ivcqBfvG6jEm+aDGpednq4Mk0LBko5dyyb1J907pclLjd/ughDKlw9EO5oKx wd1jWrh/M2z638QQ2yeOOnG1OO2VhPRdlAu4t2mTdHvWBEMAPwsXAUJ34kFZCVf/6sIf qSb3+7b5rPKkMCv9aWe0NhYuFhj1E2lMqMRNTgFVsUPMZamQev7PVB4Mz2/qZVDssvSO dlMHFEZx/2JN/he/DA+o9PBQsiz0iOQEHdNsoXITaoq6N3bdL74gu14BUhXkLMcg+tXB roMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=V7O/r4jTySGSLTjP6nvBKNHUVX0/r7KaAP+5isYafiU=; b=h0Qrc177xKt/IgGrMZyRs8u0lenmv9wlUq2gE+OChrF8jJTeFTCz1i801BF3+/7WYx Kxi3QJIT9vCrwGQDluCPSHoq/YXcEOI/1KFz3zLoRoQOm/PaMCRLnZOCcpkr81MtXGk0 CCns9SnKBN926Cj1DDKG6dirZUVl+l2W8NdW1SkOhnmPWN0B7Q3Qec54Bmq37IWILdLx nRROsbNAHD1DwhnrjhOKBN7Cd7AoCdGRmFo+TVj4+/kdUyQbIjI2UjWoS3RZZdmDFZs6 DGN4fJmjuZX4vCQo/kWFF638O+HTa16BQtyGScJ7scUKQIreSSH26/lKc/dYPxu56RBo W8mw== X-Gm-Message-State: APjAAAUXQzjGfzkByY6wR2qnUZj7OrzuQqipaWel8dJCo/TBCZ019OAf ys7d+tFk35evg6K5+CCrstq6/Pus X-Google-Smtp-Source: APXvYqyvDdkXv0SJtMI0ncTLlsJwlefnPc3J+9AKHVmlCsCNDRET5Jc/0VfNrchDoKnDc+JlV4XBjg== X-Received: by 2002:a05:600c:2107:: with SMTP id u7mr12507264wml.86.1571499290793; Sat, 19 Oct 2019 08:34:50 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/11] tests/ssh_linux_malta: Match stricter console output Date: Sat, 19 Oct 2019 17:34:35 +0200 Message-Id: <20191019153437.9820-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Match on stricter console output. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- tests/acceptance/linux_ssh_mips_malta.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index 5523ae2144..822b0553ff 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -127,19 +127,19 @@ class LinuxSSH(Test): '3.2.0-4-4kc-malta') self.ssh_command_output_contains( 'cat /proc/interrupts', - 'timer') + 'XT-PIC timer') self.ssh_command_output_contains( 'cat /proc/interrupts', - 'i8042') + 'XT-PIC i8042') self.ssh_command_output_contains( 'cat /proc/interrupts', - 'serial') + 'XT-PIC serial') self.ssh_command_output_contains( 'cat /proc/interrupts', - 'ata_piix') + 'XT-PIC ata_piix') self.ssh_command_output_contains( 'cat /proc/interrupts', - 'eth0') + 'XT-PIC eth0') self.ssh_command_output_contains( 'cat /proc/devices', 'input') @@ -151,13 +151,13 @@ class LinuxSSH(Test): 'fb') self.ssh_command_output_contains( 'cat /proc/ioports', - 'serial') + ' : serial') self.ssh_command_output_contains( 'cat /proc/ioports', - 'ata_piix') + ' : ata_piix') self.ssh_command_output_contains( 'cat /proc/ioports', - 'piix4_smbus') + ' : piix4_smbus') self.ssh_command_output_contains( 'lspci -d 11ab:4620', 'GT-64120') @@ -167,7 +167,7 @@ class LinuxSSH(Test): self.ssh_command_output_contains( 'cat /proc/mtd', 'YAMON') - # Empty 'Board Config' + # Empty 'Board Config' (64KB) self.ssh_command_output_contains( 'md5sum /dev/mtd2ro', '0dfbe8aa4c20b52e1b8bf3cb6cbdf193') From patchwork Sat Oct 19 15:34:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200269 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49FAF13B1 for ; Sat, 19 Oct 2019 15:39:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 206A22082C for ; Sat, 19 Oct 2019 15:39:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CcM2OeeM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 206A22082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqot-0002GQ-Pi for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47490) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkp-0005KY-52 for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqkn-0002wj-D2 for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:54 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqkn-0002wA-7E for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:53 -0400 Received: by mail-wm1-x343.google.com with SMTP id 3so8752339wmi.3 for ; Sat, 19 Oct 2019 08:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IrxCFtZN7IWMU6h2qOEBlnQRpVoXjxguCXHm8vL6MOI=; b=CcM2OeeMqYPuElk1PoeHPhbLqi+0FbCpBBBL9onOX3Ngllbx5ALM9Ql70J1tuFOR/0 bHAOTV9dZvBH2Qv9AnCAfB1JX5Uue0JRfIUHBi8Ec+Ci9Hit76w+uj2spZv9Ll+N9sN1 Ct3rNkfsS/X6JQkVzymOpVnYe6BOq2JParXBeB9r3GT89jiBZXq1PRLHyMMcllFM2DWM 13zp4N8pLHfMq5nbzZDU60Lp6K+Y3zSJ7LGWCgjX8mhFXdSUhsvWuuSAy29LZ2BifrWj dksJDTXYfq2MYrMeFQIh/9lB5WXETK/WfsmQ0RnJseLOqgmEyIUzHq+ebgtUOiGbsuFO Ai8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IrxCFtZN7IWMU6h2qOEBlnQRpVoXjxguCXHm8vL6MOI=; b=sUGDGEWjUAhjE66S0aw60M47fX0MVVRrUvlf6jDdFd1+X9IWFEoz4f0C7RST1qZ5mX YCYNM7BWfmjAdHNtozmrIK4dFdKL8PI97R8qRq5Mq6Sq0CEjHTstgbCPEtvlFAjRq7HD 3gG+WGwISqf0w9LiCoEk2+cIk2lBSN6uqPvpjj2lYxJ4VxKs9x/ZMCHPN5KBSGJUGckx GX/vWXVSzX9S+PR1Hck3HwHOyrqnJtHrb4UZlqqzYxQDJWvfTTpIEE7gbE+FUPHm0t9v SEzAef+/OOa8D7fLyazYZE+3lndR/lcsEQYlhF7mQWe8UgXbb2jlTVc0GhokVB0AOtxN FqhQ== X-Gm-Message-State: APjAAAWp2Doc5LCBYz5I/zOqgLQMEaVimOU8VxTq2Uxa3ndyF9wMSRAf jJmPgAqOx1U2rhcc79qlRGCA1eJv X-Google-Smtp-Source: APXvYqy4+byx2VPf51a36fVsgwz2FW1oHnR7rZgXUYGX3sidB/XDhQ/dpM68RAjHKeRqiF2wQ/RTEQ== X-Received: by 2002:a7b:c313:: with SMTP id k19mr12689068wmj.6.1571499291970; Sat, 19 Oct 2019 08:34:51 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/11] tests/ssh_linux_malta: Refactor how to get image/kernel info Date: Sat, 19 Oct 2019 17:34:36 +0200 Message-Id: <20191019153437.9820-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The qcow and kernel images use a similar pattern regarding they are for big/little endianess, or 32/64 bit. Refactor using more dictionary keys. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- tests/acceptance/linux_ssh_mips_malta.py | 75 ++++++++++++++---------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index 822b0553ff..2139c80f5f 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -26,15 +26,44 @@ class LinuxSSH(Test): KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' VM_IP = '127.0.0.1' + BASE_URL = 'https://people.debian.org/~aurel32/qemu/' IMAGE_INFO = { - 'be': {'image_url': ('https://people.debian.org/~aurel32/qemu/mips/' - 'debian_wheezy_mips_standard.qcow2'), - 'image_hash': '8987a63270df67345b2135a6b7a4885a35e392d5'}, - 'le': {'image_url': ('https://people.debian.org/~aurel32/qemu/mipsel/' - 'debian_wheezy_mipsel_standard.qcow2'), - 'image_hash': '7866764d9de3ef536ffca24c9fb9f04ffdb45802'} + 'be': {'base_url': 'mips', + 'image_name': 'debian_wheezy_mips_standard.qcow2', + 'image_hash': '8987a63270df67345b2135a6b7a4885a35e392d5', + 'kernel_hash': { + 32: '592e384a4edc16dade52a6cd5c785c637bcbc9ad', + 64: 'db6eea7de35d36c77d8c165b6bcb222e16eb91db'} + }, + 'le': {'base_url': 'mipsel', + 'image_name': 'debian_wheezy_mipsel_standard.qcow2', + 'image_hash': '7866764d9de3ef536ffca24c9fb9f04ffdb45802', + 'kernel_hash': { + 32: 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a', + 64: '6a7f77245acf231415a0e8b725d91ed2f3487794'} + } + } + CPU_INFO = { + 32: {'kernel_release': '3.2.0-4-4kc-malta'}, + 64: {'kernel_release': '3.2.0-4-5kc-malta'} } + def get_url(self, endianess, path=''): + qkey = {'le': 'el', 'be': ''} + return '%s/mips%s/%s' % (self.BASE_URL, qkey[endianess], path) + + def get_image_info(self, endianess): + dinfo = self.IMAGE_INFO[endianess] + image_url = self.get_url(endianess, dinfo['image_name']) + image_hash = dinfo['image_hash'] + return (image_url, image_hash) + + def get_kernel_info(self, endianess, wordsize): + minfo = self.CPU_INFO[wordsize] + kernel_url = self.get_url(endianess, + 'vmlinux-%s' % minfo['kernel_release']) + kernel_hash = self.IMAGE_INFO[endianess]['kernel_hash'][wordsize] + return kernel_url, kernel_hash @skipUnless(ssh.SSH_CLIENT_BINARY, 'No SSH client available') @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') @@ -79,8 +108,7 @@ class LinuxSSH(Test): return stdout_lines, stderr_lines def boot_debian_wheezy_image_and_ssh_login(self, endianess, kernel_path): - image_url = self.IMAGE_INFO[endianess]['image_url'] - image_hash = self.IMAGE_INFO[endianess]['image_hash'] + image_url, image_hash = self.get_image_info(endianess) image_path = self.fetch_asset(image_url, asset_hash=image_hash) self.vm.set_machine('malta') @@ -172,7 +200,10 @@ class LinuxSSH(Test): 'md5sum /dev/mtd2ro', '0dfbe8aa4c20b52e1b8bf3cb6cbdf193') - def check_mips_malta(self, endianess, kernel_path, uname_m): + def check_mips_malta(self, uname_m, endianess): + wordsize = 64 if '64' in uname_m else 32 + kernel_url, kernel_hash = self.get_kernel_info(endianess, wordsize) + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) self.boot_debian_wheezy_image_and_ssh_login(endianess, kernel_path) stdout, _ = self.ssh_command('uname -a') @@ -188,12 +219,7 @@ class LinuxSSH(Test): :avocado: tags=endian:big :avocado: tags=device:pcnet32 """ - kernel_url = ('https://people.debian.org/~aurel32/qemu/mips/' - 'vmlinux-3.2.0-4-4kc-malta') - kernel_hash = '592e384a4edc16dade52a6cd5c785c637bcbc9ad' - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) - - self.check_mips_malta('be', kernel_path, 'mips') + self.check_mips_malta('mips', 'be') def test_mips_malta32el_kernel3_2_0(self): """ @@ -202,12 +228,7 @@ class LinuxSSH(Test): :avocado: tags=endian:little :avocado: tags=device:pcnet32 """ - kernel_url = ('https://people.debian.org/~aurel32/qemu/mipsel/' - 'vmlinux-3.2.0-4-4kc-malta') - kernel_hash = 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a' - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) - - self.check_mips_malta('le', kernel_path, 'mips') + self.check_mips_malta('mips', 'le') def test_mips_malta64eb_kernel3_2_0(self): """ @@ -216,11 +237,7 @@ class LinuxSSH(Test): :avocado: tags=endian:big :avocado: tags=device:pcnet32 """ - kernel_url = ('https://people.debian.org/~aurel32/qemu/mips/' - 'vmlinux-3.2.0-4-5kc-malta') - kernel_hash = 'db6eea7de35d36c77d8c165b6bcb222e16eb91db' - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) - self.check_mips_malta('be', kernel_path, 'mips64') + self.check_mips_malta('mips64', 'be') def test_mips_malta64el_kernel3_2_0(self): """ @@ -229,8 +246,4 @@ class LinuxSSH(Test): :avocado: tags=endian:little :avocado: tags=device:pcnet32 """ - kernel_url = ('https://people.debian.org/~aurel32/qemu/mipsel/' - 'vmlinux-3.2.0-4-5kc-malta') - kernel_hash = '6a7f77245acf231415a0e8b725d91ed2f3487794' - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) - self.check_mips_malta('le', kernel_path, 'mips64') + self.check_mips_malta('mips64', 'le') From patchwork Sat Oct 19 15:34:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11200275 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 880CB17EE for ; Sat, 19 Oct 2019 15:42:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E76F20854 for ; Sat, 19 Oct 2019 15:42:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="E3AX8Tbg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E76F20854 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqrt-0005vV-El for patchwork-qemu-devel@patchwork.kernel.org; Sat, 19 Oct 2019 11:42:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47497) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkq-0005M2-4N for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqko-0002xI-PL for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:55 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55466) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqko-0002wq-JU for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:54 -0400 Received: by mail-wm1-x341.google.com with SMTP id a6so8967303wma.5 for ; Sat, 19 Oct 2019 08:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NgJtsZYXc8GUBV9Y62Y8rMxQDFlakDpMkIO4EX7Mgs8=; b=E3AX8TbgQiqEq8dUqYFtOi4V3lWDMUcO/q2fz2futfdy4m5C7+isj3Ent22hMojLZB 5dUSR3FtZ8/IjP9WGix6pZkihO0BTfs0KhemiyDW4H7UieztSPMcLTWQF57EOo5c7S90 9UgZos4CqbYY/FCevnQYU1MzEzaT+BVjvPv7M+zdN7jeziwVXqB1Hv5vWtSJ7KrXv6KG W6WuY7D/Dv1720LtXWIbxqpfLMSS7/KgXtLj2cSY5Ytv08KT4qZBca9begLOazZKqqqA IWHFW9E5+puByCfK1tvje4IE+OGF9HaTi0J0m/LeAZ9mHXbET5usREY3Tae8r4asvi2c n3pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NgJtsZYXc8GUBV9Y62Y8rMxQDFlakDpMkIO4EX7Mgs8=; b=lmzZYiD55ujzATtECpktS16xO93KtdHTF49HZuJxm8uxEeHcqgjm39yN1RQbPLqixc ssSFBQX1dU2/qrJd4hOGBchLH70exjHAJlDurB5jnBHJ3hG5urhNOmLGXK7fXarRLNo3 2HYn4lPeheN/jcxJ/2JMMJju62YYhbIx3S58Scum+WEP681LX+6m+U5de/kQnG90xo+5 AhYwzNXut3uThh+Nu14ArL1IcFc5ypTxuyJf71xOLyf5ald4W+JUJbq2piAv5Tbd2PSX z0gCNx54X8nCCG/gKSsxOmcdgtgU7JBfE1W7PPizXQKW1jyIyQKHjNdFVGy+rEDIlRPJ Oi2Q== X-Gm-Message-State: APjAAAU7WJhRCBk4QcNeTXW2ez6ifjyOkjOvFImOHOs7X1wVth9LBXxS GS0lZR4CZmV+YQDyXxpTSLZsofhg X-Google-Smtp-Source: APXvYqxhKIErd2dXNAFmNjv+BevWeVg9xNanZEtdr3OiDr1BIzL6lL2gFfwAcdrm37y/mQ3sfVQVNw== X-Received: by 2002:a1c:5946:: with SMTP id n67mr12569936wmb.93.1571499293434; Sat, 19 Oct 2019 08:34:53 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id j19sm15245605wre.0.2019.10.19.08.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/11] tests/ssh_linux_malta: Fix 64-bit target tests Date: Sat, 19 Oct 2019 17:34:37 +0200 Message-Id: <20191019153437.9820-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Commit 9090d3332cdcc added tests for specific to the 32-bit machines, which inadvertently make the 64-bit tests failing. Now than we have this information available in the CPU_INFO array, use it to have the 64-bit tests back. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- v2: do not include Aleksandar Rikalo mailmap change --- tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index 2139c80f5f..fc13f9e4d4 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -44,8 +44,8 @@ class LinuxSSH(Test): } } CPU_INFO = { - 32: {'kernel_release': '3.2.0-4-4kc-malta'}, - 64: {'kernel_release': '3.2.0-4-5kc-malta'} + 32: {'cpu': 'MIPS 24Kc', 'kernel_release': '3.2.0-4-4kc-malta'}, + 64: {'cpu': 'MIPS 20Kc', 'kernel_release': '3.2.0-4-5kc-malta'} } def get_url(self, endianess, path=''): @@ -143,16 +143,16 @@ class LinuxSSH(Test): else: self.fail('"%s" output does not contain "%s"' % (cmd, exp)) - def run_common_commands(self): + def run_common_commands(self, wordsize): self.ssh_command_output_contains( 'cat /proc/cpuinfo', - '24Kc') + self.CPU_INFO[wordsize]['cpu']) self.ssh_command_output_contains( 'uname -m', 'mips') self.ssh_command_output_contains( 'uname -r', - '3.2.0-4-4kc-malta') + self.CPU_INFO[wordsize]['kernel_release']) self.ssh_command_output_contains( 'cat /proc/interrupts', 'XT-PIC timer') @@ -209,7 +209,7 @@ class LinuxSSH(Test): stdout, _ = self.ssh_command('uname -a') self.assertIn(True, [uname_m + " GNU/Linux" in line for line in stdout]) - self.run_common_commands() + self.run_common_commands(wordsize) self.shutdown_via_ssh() def test_mips_malta32eb_kernel3_2_0(self):