From nobody Fri May 17 06:49:23 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1711599394; cv=none; d=zohomail.com; s=zohoarc; b=FFEZpEmB/OH+BNpMaf75zWWyB27rdtm9YO2hWLVBvY9eTWCeeKJhwei2tm0Bd8Was22krmhVDfU0BMU56AHxuJ3MJqleM6zJn9nxYjz9qlvpAPaHHHStoByGXHiXgcUbJaUDGbzWwKDsLaQ7BLp/Y/HnDHkGDiKKfnl4cIm9yaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711599394; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jqNV1Px+UeUIkQe6eNi16n5EEB0O2oNu4OLcirdIkeA=; b=NQFNKh8APhB90xiJPqIlvXrE/8auz7AkaiIOo9QNALB5vuLkI/Upco0oboEhIcJ8bQ6Nqhz/MD7bR9zT9Is16vvDtNgqdPp3mRW0oXObG1h/nbaBUfIrOxEqZRmZrNf8WqUBezf4dF1gne9XTZbI1TF0hV7rRGeowvrry+g4n1M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711599394762420.4914035751233; Wed, 27 Mar 2024 21:16:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rphBj-00078u-4J; Thu, 28 Mar 2024 00:16:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rphBD-0006YW-V6; Thu, 28 Mar 2024 00:15:58 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rphB7-00036k-Gm; Thu, 28 Mar 2024 00:15:55 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e0f2798cd8so5225855ad.3; Wed, 27 Mar 2024 21:15:40 -0700 (PDT) Received: from wheely.local0.net ([118.210.97.62]) by smtp.gmail.com with ESMTPSA id w22-20020a1709026f1600b001e0b5f9fb02sm395416plk.26.2024.03.27.21.15.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 21:15:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711599339; x=1712204139; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jqNV1Px+UeUIkQe6eNi16n5EEB0O2oNu4OLcirdIkeA=; b=m5PIN8od1vYInML8r2/NqrJiSbGp2cScs+nfJXmeeNMYPTsv158cBxt0JeDiU3h/ht ZzxjWEV4/sSnDSd7EysvLvEDeJVw9k20p6vStF1w7QKzzQOpcAvvm2ZVZbdhQmPbkF2d cSkpuUErKCO1vG9C8OliKgA7PX6Kev9e1u6nYanrTxkISgDDQ4gOZqAyO+qL6TJDCsMe 6KETF8nAd2UMnYil1O0E2IEwweWyp3azPRNpfc9TuAScN3e56r8DeAzMkqed7gTmHNbT FbeQn87odqy2E7lf99O1VHj7azSjhtNPJ72t+05xW5HY5qsiwuE/ymWT7ZWi+D5HZrLj pA/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711599339; x=1712204139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jqNV1Px+UeUIkQe6eNi16n5EEB0O2oNu4OLcirdIkeA=; b=DhYiMwRaL/KaSLQ2gXZkq+03pzgdtjnII4cY2Ek5sGab9rronGdDobDvUfPp3kO7gK fXrgnoMRTluT5DqaHOPKRoYQWru70K9sFg9FRpumakKF8PrBsOyDjcerhamhCEEgoOjI cQWfDL2TOsEySIgxPn7vNkfmYvK1Bg+LqaUY94NPXURsFTHgvVFSuZl3AqAJ8HGNvvIi 3fkSQHVAfl152rbnNWq9Kj7pulOPFYeOdfzBX6qDmAgjHy0TuO6yNK5Ly4RiC2ZoV0t+ iEBi3yPzysWv0OFKFYuXViBGeMREoFdz9oX7Run6ABlIGuSH0i26pFwOyRaSemBVfJyY P1zg== X-Forwarded-Encrypted: i=1; AJvYcCVlW/eH8Jn6SCAjqTBiu8Xzslt6nHyoysrl6QTDpRmc5f6VaeKAPXFPoGYjEOP1wjVrxD8ZUn6+K9SyE90zWGWNs4DU X-Gm-Message-State: AOJu0YxyWgYWEsjN3yH6GQgKKE8vtHjg8iUOfyHpldccU7sT3V/sgCid 5Q6YStjwkdAG38MYjhTlHWd8P0Fk5QzWWQsirQVTxbOfonj/n3Dk3x8KWYwQz5g= X-Google-Smtp-Source: AGHT+IEzv/DTp3i8g3Z4/vt5fMyPweXlHUnRGPtBfOIvA4UMzhYbAquTg7oxAmK6CPBjpeOCXhhRaQ== X-Received: by 2002:a17:902:ef52:b0:1e0:b871:53ed with SMTP id e18-20020a170902ef5200b001e0b87153edmr1919424plx.40.1711599339391; Wed, 27 Mar 2024 21:15:39 -0700 (PDT) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , qemu-ppc@nongnu.org, Peter Maydell Subject: [PATCH 1/4] tests/avocado: Fix ppc_hv_tests.py xorriso dependency guard Date: Thu, 28 Mar 2024 14:15:24 +1000 Message-ID: <20240328041527.2602823-2-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240328041527.2602823-1-npiggin@gmail.com> References: <20240328041527.2602823-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1711599396976100007 Content-Type: text/plain; charset="utf-8" For some reason the skipIf missing_deps() check fails to skip the test if it comes after the skipUnless lines, causing an error running on systems without xorriso. Avocado implements skipUnless is just an inverted skipIf, so it's not clear what the bug is or why this fixes it. For now it's enough to get things working. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2246 Signed-off-by: Nicholas Piggin --- tests/avocado/ppc_hv_tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/avocado/ppc_hv_tests.py b/tests/avocado/ppc_hv_tests.py index 5080358e25..2c8ddd9257 100644 --- a/tests/avocado/ppc_hv_tests.py +++ b/tests/avocado/ppc_hv_tests.py @@ -42,10 +42,11 @@ def missing_deps(): # QEMU packages are downloaded and installed on each test. That's not a # large download, but it may be more polite to create qcow2 image with # QEMU already installed and use that. +# XXX: The order of these tests seems to matter, see git blame. +@skipIf(missing_deps(), 'dependencies (%s) not installed' % ','.join(deps)) @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test sometimes gets stuck= due to console handling problem') @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') @skipUnless(os.getenv('SPEED') =3D=3D 'slow', 'runtime limited') -@skipIf(missing_deps(), 'dependencies (%s) not installed' % ','.join(deps)) class HypervisorTest(QemuSystemTest): =20 timeout =3D 1000 --=20 2.42.0 From nobody Fri May 17 06:49:23 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1711599411; cv=none; d=zohomail.com; s=zohoarc; b=htrGCB0ayvvgx7CjxkgbR+Lw5Bx3UVAFIeu3ZSshFnXFACZ8DccyPeKVswaNrNQom4ZLgdWyfpMKtyH1BybnwfE48m4B1m41Brhx/dEwdy/hQ0XggqqsADI/yiymk9lcYO0g362Mpk9lcjHjLYsF/4L6ZqxaJKpB0JISG0DFnx8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711599411; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NqzpXtzmhrMDzEkGd0Sfciym3rwCKwhHPnmWOgqCxBY=; b=jn5Y2riVdyYLpjMLEiIl6uZmP4lLgZLS0TsOzDz7pBYJDM3++FN2l4HdG0LZjWw+17rbtLd6iyzjT59Ux0l3A5Whnf6SXbM+cWQRhpc8w75rspgnTOnz7E3dKpt1F0I8uATnAVlH3J4qTS196bEGJJ/Jv0ZoDBk8IvWLcQS4Auc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711599411610535.6497571226216; Wed, 27 Mar 2024 21:16:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rphBp-0007MW-Il; Thu, 28 Mar 2024 00:16:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rphBE-0006Yf-IW; Thu, 28 Mar 2024 00:16:00 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rphBC-000372-1s; Thu, 28 Mar 2024 00:15:56 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1df01161b39so4781825ad.3; Wed, 27 Mar 2024 21:15:44 -0700 (PDT) Received: from wheely.local0.net ([118.210.97.62]) by smtp.gmail.com with ESMTPSA id w22-20020a1709026f1600b001e0b5f9fb02sm395416plk.26.2024.03.27.21.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 21:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711599343; x=1712204143; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NqzpXtzmhrMDzEkGd0Sfciym3rwCKwhHPnmWOgqCxBY=; b=Fl9HdHa9H7tW7EEK+QvSdTAqMv3rQCozJqY1GvRS6646V+YujWzVjl6MpzAzHgPXzf SE6yxBN4N5BbIPtPCBy/ryAbRQuAMD2Evpwd0WKE3EWPd6HQktE+3bd7RYJI0B3H4PPl RGyVQ4HwHAXM2nuGhsdfZ2zt3O1thxVr/p9wiOOOfvEwITRRo/Bn/d++U+rOaoNkrjoI rWheGr9n6In7Ab1EOQ9oUFGTORv/P0gU7/kbzY9NVqSupkCEEapHGBSd3gaK3uKbzXaZ Mci3VBXYXK50S6k1eXW1MDNSEQ/S+VvvQV7uvEECrFEC+Vx1DxkJgssww7rWiQVObHkQ P68g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711599343; x=1712204143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NqzpXtzmhrMDzEkGd0Sfciym3rwCKwhHPnmWOgqCxBY=; b=UaPRgL+5zAOQ7nlBgUyiFoIiaIVRblDVzp3DgLYV4CmIGkc0VpQ9FK/XOpHjDZJom5 apT2ZLZ3Koon9WI/Zrkkq/NVKFDVeQsxuy5S+A6XjWHGWJ7M5yIn/V61th15jgKa0JQi cZAzOfAghrG24GMeTN/YbOfRS6vYY3d8y4XHPhcso7uQWn0VXOeiJMeIFzMUXVTt9Z2e WC6JZDbHqbZFXlfhduVAq6TowpTBZDnG/NDn1zLePcIrR3JarcVO5iR1W7ceahzj9BEc ijOxEsUv1nU/nPV33VjXEz9m1jg1Vk1L76OM4UJd04iDzI9gQ+KQ+IlPwSNbak3p29pr sbXw== X-Forwarded-Encrypted: i=1; AJvYcCWx3IN+s0uxLqSGV+6CVfR/w3dynD3H0pi7ZKRYXjW3P/MOgiywjKfpJLh6Z67vm9JPqehqzu+XG/uLkmfPw5LFN2l5 X-Gm-Message-State: AOJu0YxU25mJucyEFVfLfP+8DCmDJ1E/hxXY1/tvCCL3TkXResdRJM2R sGH6+rOE3mKjIXbKpLxAS0NpjS5vyvwLxxmCGci9gieL++6QdfiSa1Az93SAebg= X-Google-Smtp-Source: AGHT+IG602GijABdOb7sI7aqe+m8hFXcp/MHPoZqCkNrFjfht151ObZ2RHdRwjfi+juOKIKAgmtjHQ== X-Received: by 2002:a17:902:d2d0:b0:1e1:179:d5dc with SMTP id n16-20020a170902d2d000b001e10179d5dcmr2116474plc.67.1711599343391; Wed, 27 Mar 2024 21:15:43 -0700 (PDT) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , qemu-ppc@nongnu.org, Peter Maydell Subject: [PATCH 2/4] tests/avocado: ppc_hv_tests.py set alpine time before setup-alpine Date: Thu, 28 Mar 2024 14:15:25 +1000 Message-ID: <20240328041527.2602823-3-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240328041527.2602823-1-npiggin@gmail.com> References: <20240328041527.2602823-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1711599413008100003 Content-Type: text/plain; charset="utf-8" If the time is wrong, setup-alpine SSL certificate checks can fail. setup-alpine is used to bring up the network, but it doesn't seem to to set NTP time before the failing SSL checks. This test has recently started failing presumably because the default time has now fallen too far behind. Fix this by setting time from the host time before running setup-alpine. Signed-off-by: Nicholas Piggin --- tests/avocado/ppc_hv_tests.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/avocado/ppc_hv_tests.py b/tests/avocado/ppc_hv_tests.py index 2c8ddd9257..bf8822bb97 100644 --- a/tests/avocado/ppc_hv_tests.py +++ b/tests/avocado/ppc_hv_tests.py @@ -14,6 +14,7 @@ import os import time import subprocess +from datetime import datetime =20 deps =3D ["xorriso"] # dependent tools needed in the test setup/box. =20 @@ -107,6 +108,8 @@ def do_start_alpine(self): exec_command(self, 'root') wait_for_console_pattern(self, 'localhost login:') wait_for_console_pattern(self, 'You may change this message by edi= ting /etc/motd.') + # If the time is wrong, SSL certificates can fail. + exec_command(self, 'date -s "' + datetime.utcnow().strftime('%Y-%m= -%d %H:%M:%S' + '"')) exec_command(self, 'setup-alpine -qe') wait_for_console_pattern(self, 'Updating repository indexes... don= e.') =20 --=20 2.42.0 From nobody Fri May 17 06:49:23 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1711599394; cv=none; d=zohomail.com; s=zohoarc; b=lGRO4uzb5xxS7o14hIhUGHsWqoTPBLJ1BgxVhn3Yi6jSIAIcxTP/o/YwbSA7rFVGUC5HLgXuqu6m3emlCRLVwmFnX5AREwvtKFtW1tWM+UVfDZqOnl5drrYQOkI0UzD5inMkZRBWrqRP5j45MrIH3UwRnc2uk/hnCEmp/a/LMdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711599394; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7RhYgZ2VP4lzdfoEaDZ5i/JmbrEu26JdSx05eA22CIE=; b=DBCGXBqSerN1w7H9Rp7UwfzwbeLuZcrbJTwQOce/P/A0eMgzyC+wAHscNa6OTjT7V3xfB7PU+exZhCK5qyn/8jQrvtyrylKFNgH4oXHtUVzj740jraM66oBwKygYC9uDwAQr979aJXVEGECNkmMg9PXRiPYgBavdmR/4rs0TlM8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711599394719929.3724931919819; Wed, 27 Mar 2024 21:16:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rphBQ-0006o7-Ja; Thu, 28 Mar 2024 00:16:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rphBF-0006Yj-JF; Thu, 28 Mar 2024 00:16:02 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rphBE-0003Hq-2x; Thu, 28 Mar 2024 00:15:57 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1dff837d674so4477985ad.3; Wed, 27 Mar 2024 21:15:49 -0700 (PDT) Received: from wheely.local0.net ([118.210.97.62]) by smtp.gmail.com with ESMTPSA id w22-20020a1709026f1600b001e0b5f9fb02sm395416plk.26.2024.03.27.21.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 21:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711599348; x=1712204148; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7RhYgZ2VP4lzdfoEaDZ5i/JmbrEu26JdSx05eA22CIE=; b=HckX1vEE0trG4roQFhfajxuSuAdesXTixeIU/+Q9HBf62wzZoeKfoDwsWn6B3W/26D jvClcaK9V/OX6Wf2dU9CFw/AundX8ffDZRaqR8uNYrjzsGnrTvk3k/TFtzLPrZF+yjFU vPBwWj4J8y9GZqYfokG5QoLLxAdVPeyf5FlBfXAXzAhtGa64mcYfBp5+uQfvDENribLz XSqP5LaJMHhGaUmPPb1dBPQ2N60TKi3gueZ0WGv94CiQSJaKgbLrjaI4jNJVdVLNSeZ+ fFN57wsEuV6nwZXZS6CddHltnY+TBZ8IEdZHSsrz2VNnRQLCntyKG1UDVveH4AZGiu3F ok7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711599348; x=1712204148; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7RhYgZ2VP4lzdfoEaDZ5i/JmbrEu26JdSx05eA22CIE=; b=Oq/AsX+Z+9fws3nrvbg/935I8CzTIy3TgBwkgBCY6Wszt/rLtfBnTiuQqvjaGBQE4O L0IKxPY8Ce/Exl+WmQA92hfiY0gL/RwQr6y20iujCEe5h54MLrK37av2cOeNRY0iizUQ aiD68uQNV8OsHz+MG540ThrbJKDQc4LSvTZdOGRiv0t5mVRWjFpnLlrwyaltV7gwiasE YvpOOgFO8c2MkdZDxr9CZjxnBpPW3hemP2ogXs/LwEAYTsoQqnnJKWdRprd4GJaModdP pFvUmfBxoczfkpm2ezSC95+jO+Qz0H99qV8NMnmx92lISTqoCBPgv8AlnhWcN7oh3JuB dRPA== X-Forwarded-Encrypted: i=1; AJvYcCXaqs3llHffwYEjlDIYbcXYEGBbqytdtmjMqAYWKHgUSeBpnov50MLMTUicXKhVkpIZYu2Nb0qNh+lnZGs1EOUqiRAb X-Gm-Message-State: AOJu0Yw4kkUaqHxe+/8o6/hYOF+VoZ57yozjtik8hEf9iqA0dOpsBnXQ GQ2kspHI2DIy2Az1/nZdhzd/eI8hmHz02V9r/ZD4GgOquBnB3KR7GzauFNfq0pM= X-Google-Smtp-Source: AGHT+IH8bfZ/br+IuIz9FaB7NRpSMtmswYP9nAf4HXmSgcS8yMWYHsoo2vQanFoDPLcleORlEk8O7w== X-Received: by 2002:a17:902:d2d0:b0:1df:16b:9cb8 with SMTP id n16-20020a170902d2d000b001df016b9cb8mr1903781plc.2.1711599347783; Wed, 27 Mar 2024 21:15:47 -0700 (PDT) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , qemu-ppc@nongnu.org, Peter Maydell Subject: [PATCH 3/4] tests/avocado: exec_command should not consume console output Date: Thu, 28 Mar 2024 14:15:26 +1000 Message-ID: <20240328041527.2602823-4-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240328041527.2602823-1-npiggin@gmail.com> References: <20240328041527.2602823-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=npiggin@gmail.com; helo=mail-pl1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1711599395151100001 Content-Type: text/plain; charset="utf-8" _console_interaction reads data from the console even when there is only an input string to send, and no output data to wait on. This can cause lines to be missed by wait_for_console_pattern calls that follows an exec_command. Fix this by not reading the console if there is no pattern to wait for. This solves occasional hangs in ppc_hv_tests.py, usually when run on KVM hosts that are fast enough to output important lines quickly enough to be consumed by exec_command, so they get missed by subsequent wait for pattern calls. Signed-off-by: Nicholas Piggin --- tests/avocado/avocado_qemu/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 304c428168..5a3ae7f6b5 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -144,6 +144,13 @@ def _console_interaction(test, success_message, failur= e_message, vm.console_socket.sendall(send_string.encode()) if not keep_sending: send_string =3D None # send only once + + # Only consume console output if waiting for something + if success_message is None and failure_message is None: + if send_string is None: + break + continue + try: msg =3D console.readline().decode().strip() except UnicodeDecodeError: --=20 2.42.0 From nobody Fri May 17 06:49:23 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1711599370; cv=none; d=zohomail.com; s=zohoarc; b=itJNM9QT/1asRhdzwWcAJExTjDD44WVVsCOqFI5GdPvbEegLfriY8XvGuzzs9ZeRan1LPUjNCEN5YhMuJP/GLE602hvukraEJ06qptV4fv10sXZizvtc5ZqIIcrPQ9R1wB3l/tgPCFjUBdXHJUhXODYklEIYUC8Anj1PI5/uFwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711599370; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BxW8RoTidESLDKkq5eDz3cLjlu91W/7FWMuBF0zDoaM=; b=J0c3O9ltU9SzxNz7XKZm4RPgAiBPCg8EGpNNQ1nA1kSvA7e6uZ9x0HBfgh6ML4OGgouRMEO6Yn9GeiCmdO4ZI2//iIxLVBDbQt49qT5fgajLWFOk0gfmZvi8g7iT5wDjkg0In7ZFaYEmj/O/hOZAvSwKhU+9MAXxzrXXBySgzxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171159937087495.75121592945959; Wed, 27 Mar 2024 21:16:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rphBM-0006g0-Q9; Thu, 28 Mar 2024 00:16:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rphBF-0006Yi-Gi; Thu, 28 Mar 2024 00:16:02 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rphBD-0003I1-Di; Thu, 28 Mar 2024 00:15:57 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1e0025ef1efso4272425ad.1; Wed, 27 Mar 2024 21:15:53 -0700 (PDT) Received: from wheely.local0.net ([118.210.97.62]) by smtp.gmail.com with ESMTPSA id w22-20020a1709026f1600b001e0b5f9fb02sm395416plk.26.2024.03.27.21.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 21:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711599352; x=1712204152; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BxW8RoTidESLDKkq5eDz3cLjlu91W/7FWMuBF0zDoaM=; b=aVJaINa3Ru39QXCEKxMlbSNBvylCDCaPh1qwJ7VOQYMfgI/vGE7VqVIwH+p5JbRcqw mo6PvW1j2+89Zg4NjSXv1cufGHw2EWOo2olcU9uPkY+F4Cj2ipoQJScMJgNSQxI5x6Qx W+qYJZZr/ShbLIY3hnd9RvpN3cD/pxKYlY8PVUWtuSJCEtL6hhgYhP5V6MIlZ7c7pWfF 2QJ0u2BAp+L69FVwIIvSl6WkRc0cQm+VVAyQdiIMA8v8bMeF4JV3fwxKlOROduZ0dKx+ 8Sooz7lDysWEWxPtaTh2eT6h1f3zRx5edVWul+XBEnV1OC+2RmiJCJaSWraC+9GetanE Wlxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711599352; x=1712204152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BxW8RoTidESLDKkq5eDz3cLjlu91W/7FWMuBF0zDoaM=; b=Yk7ntWJUdEAR0p5u3OFtErvvUK1ZxsfqlGW7Q7zUFCC1XOSxsQy3kfoBehtyiARDZ8 2elyHlABxTnoSZzkwL+H1rb75vHLmUdNNm6aexNNL2bgpT/721cEQgfeQk+g3r+Koe9N K2XITE3mH/qtUKqNMHMx9liY0xlcRm7Vp/a4wWB2FhG1Wv/IGFjkGDIALDUpPjjLFfuN JQFnxfK0LQ1YkCkpkUXlvrv1Xqc+yoA1lZUL9vjZ2H9R63jRItdX+SyMFdvbvL6UJuye h0LRIUIVZ+pLvd48jZU3Zpa0c++ZJKObvg9pU4p+l7egRuyMhcNJb7bBl436FNP9NGPt EEVw== X-Forwarded-Encrypted: i=1; AJvYcCXk9E96el7KNzTTzSLOCvEY1v3rEcj5btZLYCjYwNe/dT+Swgv+sPIGyKx/ekfJ/SjgTRupnQaXzl1OHL9OdWvuuqur X-Gm-Message-State: AOJu0Yyn7vc28eCnPNdCcJRZuL2fEVRRE2nhYgid+20XZmW5GAORNq7U ZYaU8jFXd8e+/mE1c0sdle4xtwvvyH9SvvWwjnutJ45cxChijP5YaqxG9K1OmmY= X-Google-Smtp-Source: AGHT+IHe4TtQpipRtv65fEN4a7zsREs+DSpd1jTBvkRfhph65b7dDf02PaThiH5W7859NrBiLn7r/g== X-Received: by 2002:a17:903:238e:b0:1e0:10c1:6288 with SMTP id v14-20020a170903238e00b001e010c16288mr1763879plh.51.1711599351870; Wed, 27 Mar 2024 21:15:51 -0700 (PDT) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , qemu-ppc@nongnu.org, Peter Maydell Subject: [PATCH 4/4] tests/avocado: Mark ppc_hv_tests.py as non-flaky after fixed console interaction Date: Thu, 28 Mar 2024 14:15:27 +1000 Message-ID: <20240328041527.2602823-5-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240328041527.2602823-1-npiggin@gmail.com> References: <20240328041527.2602823-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1711599372849100003 Content-Type: text/plain; charset="utf-8" Now that exec_command doesn't incorrectly consume console output, and guest time is set correctly, ppc_hv_tests.py is working more reliably. Try marking it non-flaky. Signed-off-by: Nicholas Piggin --- tests/avocado/ppc_hv_tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/avocado/ppc_hv_tests.py b/tests/avocado/ppc_hv_tests.py index bf8822bb97..0e83bbac71 100644 --- a/tests/avocado/ppc_hv_tests.py +++ b/tests/avocado/ppc_hv_tests.py @@ -45,7 +45,6 @@ def missing_deps(): # QEMU already installed and use that. # XXX: The order of these tests seems to matter, see git blame. @skipIf(missing_deps(), 'dependencies (%s) not installed' % ','.join(deps)) -@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test sometimes gets stuck= due to console handling problem') @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') @skipUnless(os.getenv('SPEED') =3D=3D 'slow', 'runtime limited') class HypervisorTest(QemuSystemTest): --=20 2.42.0