From nobody Thu Jul 25 09:17:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WV4z26FKkz5RgTV; Thu, 25 Jul 2024 09:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WV4z22r6kz40yJ; Thu, 25 Jul 2024 09:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721899038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQaIwWJClxzttZSlVQqw8oUucWDB1JoVDXiOeydDals=; b=lnzH4ILCnQVYlIQ6fwQWXenx5iHTZwrWLLee4wvUXXSOYKZfmtmagRmP1R5LpW2rJihuDo hJHjM8LXkujrmh8DqPgsyJhO4I5NGyJhK47Nrt7lm+DG6ZItIPu74BizKFPLCV9VnqGx9c 77pmRQxPmS4ZGsDmU2tXauAVVc25h7wFQdtI5p+y+XrkkqWqTI8Z+RCb1DTgiov/YzUwiP i1+LclfKYJuVnyC3/nOopj4ZmI22bIWO++zP1wDjtQcCRHHx/eeTj6BSWfgLd/4JRqlYLr lvH+GvWsZlCG1c+SmpooBX/HreXqqq/SEnpa2n68tG0Hp/ZGfPRVmLP9QdY3qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721899038; a=rsa-sha256; cv=none; b=ANkBSKEHFligP53UywvpLBBMrk9Gqelu1FqG4cu1UyxutCT9sxYHXFbXfWGZ0BtGZZ/3Ze +IDGBAqR9l9S0qG25Q1xzrhjMUL7r/N7KP+jpejM8MS1+8/PBkd9i5UxArxJnEKd2RvGR7 Snk/41LpnfyeHRxKwU1JiFNAy7dSTjA6AURe/mB8FYHfql35mk7/xqDSetleDyfVqE3A43 yyAu//IkHbuJMRCakZL675mhdPLOrOcTSh5ZQ/SXDrYoIo2labIoDqEMBRvO5mUT9PTwgr c9kPNWy0jR+IadmL8m2KR8loEMdVNbzjxCM0e/0JPQpNipdLBMXxJjWwk+TmOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721899038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQaIwWJClxzttZSlVQqw8oUucWDB1JoVDXiOeydDals=; b=UEGPv39sAvt4nTvpSRwiuGrQKboH2v1dNZFGZRsX3r+vq4hSlFw7ZHxUZGHHmtH9Cq0feM 8GBvmZiSslFm03tmmSo6dWTYst9nApT06ukMvfhe0xeforXeJuq1f7GHDSBMaVeFs4yhfW oeVKzq/gd4gRekbdzqVOvH4Id+F3A/McFTF+oQD8oMQT4gPWBbhSOCD2DEHPmM9iwKUR0n lCO4SG8DXdmeLr3yrMq2hC3o9/byPcPK7b4+2IE41HAqI3zUatBLDq2fQJjvQfVc86qCeW kENr0VihmkuhQ1kMpGWUFfXmAZWVWyWsbMaCG9Re3Btw36z0NW1ydXuvy/UOqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WV4z21w9Dzpv6; Thu, 25 Jul 2024 09:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46P9HIHO089835; Thu, 25 Jul 2024 09:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46P9HIum089832; Thu, 25 Jul 2024 09:17:18 GMT (envelope-from git) Date: Thu, 25 Jul 2024 09:17:18 GMT Message-Id: <202407250917.46P9HIum089832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8edd6c07c8da - main - nuageinit: Fix tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8edd6c07c8dafcc5828bceb5fea0684c7d0d0775 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8edd6c07c8dafcc5828bceb5fea0684c7d0d0775 commit 8edd6c07c8dafcc5828bceb5fea0684c7d0d0775 Author: Jose Luis Duran AuthorDate: 2024-07-23 22:28:45 +0000 Commit: Baptiste Daroussin CommitDate: 2024-07-25 09:15:29 +0000 nuageinit: Fix tests Commit 07d17ca189fcf3cc44b7706040b05ca8135c3b85 set the recommended permissions for the SSH authorized keys file and directory. The tests, however, were failing on CI. Use stat to check for the proper permissions. Fixes: 07d17ca189f nuageinit: Set recommended SSH permissions Reported by: Jenkins --- libexec/nuageinit/tests/nuage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 531c171a3271..29842bff3d6b 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -17,8 +17,8 @@ addsshkey_body() { if [ ! -f .ssh/authorized_keys ]; then atf_fail "ssh key not added" fi - atf_check -o inline:".ssh: 040700 [drwx------ ] -> 040700 [drwx------ ]\n" chmod -vv 0700 .ssh - atf_check -o inline:".ssh/authorized_keys: 0100600 [-rw------- ] -> 0100600 [-rw------- ]\n" chmod -vv 0600 .ssh/authorized_keys + atf_check -o inline:"40700\n" stat -f %p .ssh + atf_check -o inline:"100600\n" stat -f %p .ssh/authorized_keys atf_check -o inline:"mykey\n" cat .ssh/authorized_keys atf_check /usr/libexec/flua $(atf_get_srcdir)/addsshkey.lua atf_check -o inline:"mykey\nmykey\n" cat .ssh/authorized_keys