From 9650394b8cadaa6ef9f4732e10610058432935c8 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 21 Jan 2023 18:20:01 +0100 Subject: test_openpgp: Put common part of Manifest into a var MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- tests/test_openpgp.py | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/tests/test_openpgp.py b/tests/test_openpgp.py index e594416..1d7ab5c 100644 --- a/tests/test_openpgp.py +++ b/tests/test_openpgp.py @@ -69,10 +69,7 @@ jCvJNJ7pU8YnJSRTQDH0PZEupAdzDU/AhGSrBz5+Jr7N0pQIxq4duE/Q -----END PGP PUBLIC KEY BLOCK----- ''' -SIGNED_MANIFEST = ''' ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +COMMON_MANIFEST_TEXT = """\ TIMESTAMP 2017-10-22T18:06:41Z MANIFEST eclass/Manifest 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 @@ -82,7 +79,14 @@ DATA myebuild-0.ebuild 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ MISC metadata.xml 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 DIST mydistfile.tar.gz 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 + SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709\ +""" + +SIGNED_MANIFEST = f""" +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +{COMMON_MANIFEST_TEXT} -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEgeEsFr2NzWC+GAhFE2iA5yp7E4QFAloCx+YACgkQE2iA5yp7 @@ -94,7 +98,7 @@ ZIfqeaQ4NoefmxQunyEjT+8X2DMaEeHQni7dwjQc+FiN4ReV9aWbLo2O2cArqEHR mkkhTd2Auao4D2K74BePBuiZ9+eDQA== =khff -----END PGP SIGNATURE----- -''' +""" DASH_ESCAPED_SIGNED_MANIFEST = ''' -----BEGIN PGP SIGNED MESSAGE----- @@ -149,20 +153,11 @@ mkkhTd2Auao4D2K74BePBuiZ9+eDQA== -----END PGP SIGNATURE----- ''' -EXPIRED_SIGNED_MANIFEST = ''' +EXPIRED_SIGNED_MANIFEST = f""" -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -TIMESTAMP 2017-10-22T18:06:41Z -MANIFEST eclass/Manifest 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 -IGNORE local -DATA myebuild-0.ebuild 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 -MISC metadata.xml 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 -DIST mydistfile.tar.gz 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 +{COMMON_MANIFEST_TEXT} -----BEGIN PGP SIGNATURE----- iQE5BAEBCAAjFiEEgeEsFr2NzWC+GAhFE2iA5yp7E4QFAlnxCXcFgwABUYAACgkQ @@ -174,22 +169,13 @@ HSxRUCkTK1jBuP/v/rjdqUJw3LXAbjxFl9SyUX4AgCgHqgso3IZwjAprQRKNSObO t5pTRGhLWgdLUrs7vRB7wf7F8h4sci/YBKJRFA== =VGMV -----END PGP SIGNATURE----- -''' +""" -SUBKEY_SIGNED_MANIFEST = ''' +SUBKEY_SIGNED_MANIFEST = f""" -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -TIMESTAMP 2017-10-22T18:06:41Z -MANIFEST eclass/Manifest 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 -IGNORE local -DATA myebuild-0.ebuild 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 -MISC metadata.xml 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 -DIST mydistfile.tar.gz 0 MD5 d41d8cd98f00b204e9800998ecf8427e\ - SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 +{COMMON_MANIFEST_TEXT} -----BEGIN PGP SIGNATURE----- iLMEAQEIAB0WIQR+nd48vkfkN0GN90A4udL3bMgzzAUCX0UGrAAKCRA4udL3bMgz @@ -198,7 +184,7 @@ g7VRUc//lz5sDUShdUUlTYjCPGLaYf2rBZHqd5POGJOsbzu1Tmtd8uhWFWnl8Kip n4XmpdPvu+UdAHpQIGzKoNOEDJpZ5CzPLhYa5KgZiJhpYsDXgg== =lpJi -----END PGP SIGNATURE----- -''' +""" def strip_openpgp(text): -- cgit v1.2.3