From patchwork Mon Oct 26 14:31:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5568 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 26 Oct 2026 15:32:00 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f187.google.com (mail-oi1-f187.google.com [209.85.167.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69QEVw6M011452 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 26 Oct 2026 15:31:59 +0100 Received: by mail-oi1-f187.google.com with SMTP id 5614622812f47-4b37620eb73sf5350960b6e.1 for ; Mon, 26 Oct 2026 07:31:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1793025113; cv=pass; d=google.com; s=arc-20260327; b=LZ96rrsRUWlo9kndLL8TJdB5TNjbefcTmcXccpe5lfgA5ZqIFFnN3rjUsZCFWRGiuS qo17zDKNhmn88gpY6XeYvrxC3kw0f7zaLEJw2/pSwuzoEmz38leZdwF9IRFggIiQALo4 W/A16QXJe+qz0FoM75orsCY3km+BVL7U9bO+I87j6qpDjsDH98AR2WtXRp/XmGR7MPXI QypoPdyBJCrL6YwkvgyfYBXuu52DTw1P1kNP3c4gQR3UeX5sEX+J1/q9Ozwr0WM3c6ke E8zBo89SzN1o0/QeC4XNBIhU34Pf3nDAWA1kW28w+SPK09sCDILJKjiFtBriR5aVvvnu YmGQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=529n9I258lCJzFbQstPKUzvMecVv/mAGqvfiLoGpEpQ=; fh=kwkuH1I018sF4kpQ7vX4frXWzNWgqQsXa0EBh7CcSjk=; b=lrMIao2vQhX+BP6Zabnmv+2QBUmdIY5AQydA/HRE19FwqU+YuV+BL37by76mit/OHp y8SjnxtFFrp7Pd2S5U0fEoG6MT4WqMJlcUxTwKdW+DZCbYDLgMsVRu+JIT/qgHC7gmy6 MtVlvPv/gtVu1u3459q211TwB9PFg8Zk1qqFV4cjn6GaaTE1YHjLz2kP3D7/n/IhigYV 02UoTBT8elH9PVS8MUuxJTUONyixy3zV31BcCBKrv0U6+rEMc0WHGHfH8+g5eIVLzHm1 1eI9tMMKul/+ByivcWafBah+Pr9xniheByFZhnYq46TR+bKsun9+EEoWRoaZIMQsa9zo OgTA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=ihaeWlMU; spf=pass (google.com: domain of fm-1047747-202610261431501e7d64aa8300020726-fv2ac0@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1047747-202610261431501e7d64aa8300020726-fv2Ac0@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1793025113; x=1793629913; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-type:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=529n9I258lCJzFbQstPKUzvMecVv/mAGqvfiLoGpEpQ=; b=v1QV1snO+fElfucpBWW7SPxipYbJoCs9QlYeXclC9+bYM8KdkdgB7umHd3pZ9izUnH HFpIxZ8qDO9ybSutKw/Y8DXjPZBN1hJQOG9cRGzwIAZcKFGhyePtSaWxqHAAASciruvm VXMVHXOyUyOwh2XWzeBZGC68n8Mo5yTEZiiyTvmUUeoyR9k2J3X4e6RSlJzdVJu1Cira i4CpQLdUdvYenEjBX8BnOfZLrNeMUgEpP6xdhe2gjCPttjB68H1pMJv8hgMG1/FEBv1g TlHs5Yk/XqQbznOs8Agl1FTb1b9juLuLIArUaCyi+u8oL5W71GBKgaMwuQ+05CILY11h 1wpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793025113; x=1793629913; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:reply-to:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to:content-type; bh=529n9I258lCJzFbQstPKUzvMecVv/mAGqvfiLoGpEpQ=; b=MEsNc90hFeYBQXuSMOolpGS1GDFX/A6VfIFXyjcevBJfoHDENJzPHJtc/DqDjTrI2h AobfvYhM0jFbi6vx1mpOElcOWi2byISukVBJH6LenQzTX9byIw6uma+L13KKu9PY/wHw rQNM1Q2mxMVyyLpir585b4FcVlpXwIp+N6cSd6BlF0BW3L8hYRlJwcN1/em8n4WL1zsd XWWMYDzV4Mh3C9NbQ1x8Fxt9FL8DIvZdd0fpGTWg/bwRyRT8wFAQFtAbKyEampzd8p9m ohUZDwL1wOJWeo1DKHql9M6t/4zGhPwCqD+luL04wres05pzl6Rldwd8EfaOrSJ3J+Dj O/Wg== X-Forwarded-Encrypted: i=2; AKwUvBzfRrU0YFLzj3cWMV6NuFKxdweSLWLQiXVm2/kDme4NqgL4rTif0sBPlGW3PC2fDCLctCv/DJU=@isar-build.org X-Gm-Message-State: AFq9FYLDRVE3V53fZNlEJAwHxOahg0fPdNE/Xie75Y9+0wk2VwYWuC9B 9myysQxtgkinCDYwLirjHY/IQBIYZdQgO2x2jmqgZZNIT1CEx1RUPUpr X-Received: by 2002:a05:6808:10ce:b0:4e6:db9c:9a7c with SMTP id 5614622812f47-55c002ec88bmr3858007b6e.63.1793025113198; Mon, 26 Oct 2026 07:31:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeRaiksvYoKhRk6LW7Wsf/uoD/zfCUt8nk86djNY5y9Rw==" Received: by 2002:a05:6871:9f10:b0:49e:1e26:d0ef with SMTP id 586e51a60fabf-4a81c935348ls3738755fac.1.-pod-prod-01-us; Mon, 26 Oct 2026 07:31:52 -0700 (PDT) X-Received: by 2002:a05:6808:150b:b0:539:4d53:1708 with SMTP id 5614622812f47-55c0028722fmr3848367b6e.49.1793025112082; Mon, 26 Oct 2026 07:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793025112; cv=none; d=google.com; s=arc-20260327; b=GAFJz00ZimYzlF+IqBZqWZNR5Wo8Vd/d5uJpFac7A5azL9LOpmfZrPlacx/5yqm3Dj hnuKt+pE6ujl1YsTRGf2wttCR5Kiv0md9UZeanYJdkTHyTv92chsYSrG8ho5AtysNvMN zmdHlYEXdmD5vXPmkoCGi1GjhlGy/0Nev2mOOhKjTDDo2c/tgyBHHHoDOkR9qPyVUPy3 3H1kydOJGo/iL0+WhnCB92abcfjFYT590MyerzDjmAYsRCCi37rQjfh1C2QH1/6l7PjZ uMk0wIxViNgAle7rpaTkHlT3b1nFu+wBL1HTdzpv3Zc5i3ZHIWWnGJ0wC9T8Ek5ZUQzH 1Tqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=SOv8gz6v4+7p200v+I1FBzV2bVAs/5tcENZ5OEOgME8=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=VqsoUauOkK0xhvRwypdUKvNV7jl2QbomTc8yoDHhM7KEUce+n6F3OL22TKBQfqA6kn ZJq1si0an0joV+coZNg3gfO8SCX6j32vwr/PeWTLQZF7BfU2gxj/XROM8NY6qU4bDk1Y 4pwVOzeuq4ItFMpvTDzUyJaw9IOuQywq9T1Ikkdn+Rjy2KR05RMGJ1zaiXolnRN5CNgj 5vr1Fg5XJQYMXBiuoPg4XtwynEjFOMis9wZPbCZgK15J/E64aphdeSW1gYlUgopa7kWQ xfp8CKJpOE/ctEdEBwgETPh54cA4OyLy06A9JTI4NRgxaTtJG76mFpk2W0ZQbgwPQOzE BlEw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=ihaeWlMU; spf=pass (google.com: domain of fm-1047747-202610261431501e7d64aa8300020726-fv2ac0@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1047747-202610261431501e7d64aa8300020726-fv2Ac0@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 5614622812f47-55e00d8033bsi48068b6e.3.2026.10.26.07.31.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Oct 2026 07:31:52 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1047747-202610261431501e7d64aa8300020726-fv2ac0@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202610261431501e7d64aa8300020726 for ; Mon, 26 Oct 2026 15:31:50 +0100 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH v2 2/4] testsuite: fix deterministic password test in image account extension Date: Mon, 26 Oct 2026 15:31:30 +0100 Message-ID: <20261026143132.1067398-2-clara.kowalsky@siemens.com> In-Reply-To: <20261026143132.1067398-1-clara.kowalsky@siemens.com> References: <20261026143132.1067398-1-clara.kowalsky@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1047747:519-21489:flowmailer X-Original-Sender: clara.kowalsky@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=ihaeWlMU; spf=pass (google.com: domain of fm-1047747-202610261431501e7d64aa8300020726-fv2ac0@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1047747-202610261431501e7d64aa8300020726-fv2Ac0@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Clara Kowalsky Reply-To: Clara Kowalsky Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= The test expected two process.run calls which worked for the original crypt-based implementation. Commit 6144daf9 replaced crypt with an openssl passwd subprocess, adding a third call, but did not update the test. Also mock the openssl output and verify the expected salt and password input. Fixes: 6144daf9 ("image-account-extension: Avoid deprecated crypt module") Signed-off-by: Clara Kowalsky --- testsuite/unittests/test_image_account_extension.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testsuite/unittests/test_image_account_extension.py b/testsuite/unittests/test_image_account_extension.py index 8bf5f82b..266883c1 100644 --- a/testsuite/unittests/test_image_account_extension.py +++ b/testsuite/unittests/test_image_account_extension.py @@ -118,11 +118,16 @@ class TestImageAccountExtensionImageCreateUsers( ) with patch.object(process, 'run') as run_mock: + run_mock.return_value = (encrypted_password, '') image_create_users(d) password_data = f"{test_user}:{encrypted_password}".encode() - assert run_mock.call_count == 2 + assert run_mock.call_count == 3 + run_mock.assert_any_call([ + 'openssl', 'passwd', '-6', '--salt', 'eb2e2a12cccc88a', + cleartext_password, + ]) assert run_mock.call_args[0][1] == password_data