From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 6 Jun 2023 10:18:56 +0000 (+0200)
Subject: test_ukify: no stinky root needed for signing
X-Git-Tag: v254-rc1~274^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d66468243d888dd721ba0072cbad742ab6fc690;p=thirdparty%2Fsystemd.git

test_ukify: no stinky root needed for signing

C.f. b2efe286587e11e2aa4a6c7e4a2c15da3bb58a2a.
---

diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py
index ab89e11b73d..05e2668d549 100755
--- a/src/ukify/test/test_ukify.py
+++ b/src/ukify/test/test_ukify.py
@@ -501,10 +501,6 @@ def test_efi_signing_pesign(kernel_initrd, tmpdir):
 def test_pcr_signing(kernel_initrd, tmpdir):
     if kernel_initrd is None:
         pytest.skip('linux+initrd not found')
-    if os.getuid() != 0:
-        pytest.skip('must be root to access tpm2')
-    if subprocess.call(['systemd-creds', 'has-tpm2', '-q']) != 0:
-        pytest.skip('tpm2 is not available')
 
     ourdir = pathlib.Path(__file__).parent
     pub = unbase64(ourdir / 'example.tpm2-pcr-public.pem.base64')
@@ -562,10 +558,6 @@ def test_pcr_signing(kernel_initrd, tmpdir):
 def test_pcr_signing2(kernel_initrd, tmpdir):
     if kernel_initrd is None:
         pytest.skip('linux+initrd not found')
-    if os.getuid() != 0:
-        pytest.skip('must be root to access tpm2')
-    if subprocess.call(['systemd-creds', 'has-tpm2', '-q']) != 0:
-        pytest.skip('tpm2 is not available')
 
     ourdir = pathlib.Path(__file__).parent
     pub = unbase64(ourdir / 'example.tpm2-pcr-public.pem.base64')