From nobody Tue May 14 03:42:13 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683132669; cv=none; d=zohomail.com; s=zohoarc; b=QFmANTGOtmBf/VQp35KAqT/e0GUpD4aDV68j8EP7U06kfqjfXWQKBai63hHdnPoH4PNeEnDJHTn2vK0miI/O3vxRUZ8MhY+5UvujI3V6t/HYkSZ2Id3dTMrZQalAoyMLv4vZb8DxVmjINsTeG8/3lroOcS5D2wRJjA/PmyJsLUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683132669; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=xadYtkcnEM+WT5RFWy/7wy8ltsLp6Cp5207ul9kqQiM=; b=mA7qyqNt3yUjBxppE1uYX8bw8wUpKq3qC8pdX3Dpgn5Bf15GNrWawDC78Ydoht/eyR1nUwBfSO3gUL5Z2fI/BLDi2nRNIBzwKfTynt/LfypU1XBLoFSySJer8cis+koFtWgyvuqKMsI4dOTpZVo//0DauEidcOPSztEuiVvgaUE= 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+importer=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 1683132669763307.2264077123035; Wed, 3 May 2023 09:51:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puFgc-0004jq-AI; Wed, 03 May 2023 12:50:38 -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 1puFga-0004jY-3s for qemu-devel@nongnu.org; Wed, 03 May 2023 12:50:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puFgY-00022f-6C for qemu-devel@nongnu.org; Wed, 03 May 2023 12:50:35 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-401-tjiPqPbpNn62fRd_KLGCiQ-1; Wed, 03 May 2023 12:50:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 459F3886461; Wed, 3 May 2023 16:50:29 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.192.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FEF4C15BAD; Wed, 3 May 2023 16:50:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683132633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xadYtkcnEM+WT5RFWy/7wy8ltsLp6Cp5207ul9kqQiM=; b=H/JgBuTQdHu9xaxh5rw6KuAkg0A3+3oWsJ30rfssxFBV8kBXW3qKFfEmCh9HL2VjPvXR1J OdFTYdHO7LtMeu2+d7CzBcxZjZTdd7yC88XxS1hULMRJ+FzE2KboeNdTIW+fenKsPSYgH8 QsDNh90P/AWfk0NGBVPwtC9cPo9V3Ow= X-MC-Unique: tjiPqPbpNn62fRd_KLGCiQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, vsementsov@virtuozzo.com, nikita.lapshin@virtuozzo.com, qemu-devel@nongnu.org Subject: [PATCH] iotests/nbd-reconnect-on-open: Fix NBD socket path Date: Wed, 3 May 2023 18:50:19 +0200 Message-Id: <20230503165019.8867-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683132671349100001 Content-Type: text/plain; charset="utf-8" Socket paths need to be short to avoid failures. This is why there is a iotests.sock_dir (defaulting to /tmp) separate from the disk image base directory. Make use of it to fix failures in too deeply nested test directories. Fixes: ab7f7e67a7e7b49964109501dfcde4ec29bae60e Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/tests/nbd-reconnect-on-open | 3 ++- tests/qemu-iotests/tests/nbd-reconnect-on-open.out | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/tests/nbd-reconnect-on-open b/tests/qemu-io= tests/tests/nbd-reconnect-on-open index d0b401b060..3ce52021c3 100755 --- a/tests/qemu-iotests/tests/nbd-reconnect-on-open +++ b/tests/qemu-iotests/tests/nbd-reconnect-on-open @@ -26,7 +26,8 @@ from iotests import qemu_img_create, file_path, qemu_io_p= open, qemu_nbd, \ =20 iotests.script_initialize(supported_fmts=3D['qcow2']) =20 -disk, nbd_sock =3D file_path('disk', 'nbd-sock') +disk =3D file_path('disk') +nbd_sock =3D file_path('nbd-sock', base_dir=3Diotests.sock_dir) =20 =20 def create_args(open_timeout): diff --git a/tests/qemu-iotests/tests/nbd-reconnect-on-open.out b/tests/qem= u-iotests/tests/nbd-reconnect-on-open.out index a35ae30ea4..b3dd90f2a3 100644 --- a/tests/qemu-iotests/tests/nbd-reconnect-on-open.out +++ b/tests/qemu-iotests/tests/nbd-reconnect-on-open.out @@ -2,10 +2,10 @@ read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 Check fail to connect with 0 seconds of timeout -qemu-io: can't open: Failed to connect to 'TEST_DIR/PID-nbd-sock': No such= file or directory +qemu-io: can't open: Failed to connect to 'SOCK_DIR/PID-nbd-sock': No such= file or directory =20 qemu_io finished in 0..0.2 seconds, OK Check fail to connect with 1 seconds of timeout -qemu-io: can't open: Failed to connect to 'TEST_DIR/PID-nbd-sock': No such= file or directory +qemu-io: can't open: Failed to connect to 'SOCK_DIR/PID-nbd-sock': No such= file or directory =20 qemu_io finished in 1..1.2 seconds, OK --=20 2.40.1