From nobody Mon Jun 23 07:44:07 2025 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 4bQg7r19DSz5ywk3; Mon, 23 Jun 2025 07:44:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQg7q5PJCz4CMT; Mon, 23 Jun 2025 07:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664647; 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=IfC3DYSXlwd2j8ZV5DCjX8hFv2c668mM9MiZ7KxTJ0Y=; b=QtJJjUFLIqllqxzmuJn+cgwlYbcjCAZEdGNLSSUelpcTTnIPTgh251wgeuHU9/q+QOnbH+ 51nls9CsR52Kp+E3Zx80VGqLFOOeeqj6mCGrITZ8nVh3wsrS7GTNiScxzZdNtUIHrvISIA nWwkqrjLUSzyxYUHCdabQnryJIhh0lBclwXFB2AR5wvuEEIWjyfh3Ixc+SKnl/WhlIpNRc jNuIxKIsDuUhHzfOegzQhmrMueYZY5+mLfxAg+1g6eixnTd5F2EDOoANVQ3wdlL2TU88R1 7gHH89TDL46VXV3Q7gmE4112T2rW4WW2hfElhtiqOHO5KdN0/vhHR2L/I5dw/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664647; 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=IfC3DYSXlwd2j8ZV5DCjX8hFv2c668mM9MiZ7KxTJ0Y=; b=CmpRRBXipvaZsUR8MzKwe6rv7rKxXrxAlwe9PHuZSCLqIRyA3X/BGW0SUDYirPY0eGe9/r bq6nVt89a+PjTF/ReL4Bhx4T+luUEgBy+q1a9bNZtklLQ7W/CNHIBnv0qjVLMHLwyO8cfS qoVbxVdPZe8/aOtsomD4oarEH5ISg9WLedtiKrZzlfw1/STPFJ6emtPv3ZDh5HpQTweo1D 7VCfk4YavH0lTjS2ygTFixc/vwPrE+ymaQza3eKFPs+KA9CJvli6Xf0d3vqNl5oZ2lShvG DPul9/6jkpxxy83cnfUCi7IRLtBXhehToz3qGWnzsJpbl5llTfslv+c+Z2brsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750664647; a=rsa-sha256; cv=none; b=xWtJXzNiVDfB+sE2RCppgfEjcx2IxDtp69lhHAyN/W7OyNyaHHT2y2fIQ8wHPnlEexzwCv ktWG5x0d7elkm7X1AXJ62m62ainiX6PVp3TJZxy+VPTGIbUzK5p0hZobBuJNqAzbYUYOKm J9bONL+un3IoBX3CDJ1w8y2Xn8N/D7/eLfnHLzJjJw5ifEihR3AI2e8jBw0OAN3Cl2d0qc tyIXFqBcMymj69O5yh1UQXL+nxknIKx2/E0HguEUhBbIx2gAoRfQARpmNKX0kPhcVwjFvT e9qtQgq0sB6b1c76W0sEp7H4X3ZpG95fHFnWkZAbFEPPiWnr1QKeUTSrEyT4QQ== 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 4bQg7q4mfgztl9; Mon, 23 Jun 2025 07:44:07 +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 55N7i78n067118; Mon, 23 Jun 2025 07:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N7i7jg067115; Mon, 23 Jun 2025 07:44:07 GMT (envelope-from git) Date: Mon, 23 Jun 2025 07:44:07 GMT Message-Id: <202506230744.55N7i7jg067115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: de9af2811564 - stable/14 - nuageinit: helper function to setup adduser 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/stable/14 X-Git-Reftype: branch X-Git-Commit: de9af281156426f8608299f761c3fb525c7b990c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=de9af281156426f8608299f761c3fb525c7b990c commit de9af281156426f8608299f761c3fb525c7b990c Author: Sebastien Baylocq AuthorDate: 2025-06-05 20:52:54 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-23 07:43:12 +0000 nuageinit: helper function to setup adduser To carry out the userdata unit tests, you need to set up the environment in order to skip adding the default user (nuage.adduser(default_user) Sponsored by: OVHCloud (cherry picked from commit e38f521f53d70423064a987be08c3bd5debe3a2e) --- libexec/nuageinit/tests/nuageinit.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 1b67468971a6..811eb9c0c73b 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -24,6 +24,22 @@ atf_test_case nocloud_userdata_cloudconfig_chpasswd atf_test_case nocloud_userdata_cloudconfig_chpasswd_list_string atf_test_case nocloud_userdata_cloudconfig_chpasswd_list_list +setup_test_adduser() +{ + here=$(pwd) + export NUAGE_FAKE_ROOTDIR=$(pwd) + mkdir -p etc/ssh + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/csh +sys:*:1:0::0:0:Sys:/home/sys:/bin/csh +EOF + pwd_mkdb -d etc ${here}/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF +} + args_body() { atf_check -s exit:1 -e inline:"Usage: /usr/libexec/nuageinit ( | )\n" /usr/libexec/nuageinit