Correct scene33 hash + regen sigs after rebase

It seems the file lost a space character, making the tests fail

tests/integration/files/file/base/grail/scene33.SHA256

@@ -1 +1 @@
-2689de4b07720aafe8f709619f142021ae8dbdd2742a3c86701cd794f97f506c  scene33
+2cbef1330c258cd098f7cb21a6ef576bee60fad8f5aa90c6607f59009ff6c17f  scene33

tests/integration/files/file/base/grail/scene33.SHA256.asc

@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAAEIAB0WIQT4zMjLXh2IaNqlhZqx+apXxJfnHAUCY9p1FwAKCRCx+apXxJfn
-HBb4BACEdEmETIy6bo16qS+vh8U4WC0V6/toslO5dokBpKAaD2Xg1+mtyaUhmXTu
-e6OCxqMGxVbUgmOpo4r4TX+FeqASQVNB4Kk9urwUuSa1FKZTngm+bKGnFBLbJKjm
-SKZBmmvtc4iIUWZtucLJWgzbD2bv/fcEI8A/8euSrfM1ArWQHw==
-=BsFN
+iLMEAAEIAB0WIQTvA3ZfWe6QSTDIp4FVOoKgWMDHlQUCZVXbKgAKCRBVOoKgWMDH
+lfT0A/9oemZs9VCIN6rAkG2giMkUVaoQD/4NEBW9fzVLOOZTj2HkLjdKafetat7y
+nc47VVt6i0Htz1wiVmzdF7fwAxa5pNS+Gh7OyBP84I0eNwFviwRq2vdzTP71tab+
+/ehKNG/AUIKUz+p9UcNnkRV2/L0wbyymHqGWBB97944+qSAyqw==
+=rkjG
 -----END PGP SIGNATURE-----
 
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAAEIAB0WIQSN8J3lSrZ/YDHXHW8h5Z/XBbOHgQUCY9p1KAAKCRAh5Z/XBbOH
-gaoTA/0V75HNnbA/+nuaw7pBJr1EBUh74+qAb1QQvqNrNdJhgZGLlEwz43kPopUr
-MxFVBaz82lQ4nxaZXT/06trjNqnaacLcvRD67iwCPTBO3UR5AEfjZlP1ahAkCRQD
-DF6gLHkm00u7hXEBH3rfp5lkWt0sdHLzuiQ6YVIAwOP412fpoQ==
-=2cF/
+iLMEAAEIAB0WIQQRi0+reAOMst97aeIPbEImR0ZckwUCZVXbFQAKCRAPbEImR0Zc
+k2fuA/41PBR5YUYej9yjjSXITRjaciLGb4opXM1HGqGApm+NBgvXs9zWsQ+yRaAH
+FI8ahLHsWruWF58bF64vuaGU8V0IA1GgXkBkmwoNMvBa1URIRf3SXre4+QVxNnxV
+o6AktI3lCjTdkMiQXwAc/GgGpi1JulXBj/2RjSz6euy2vO5xFQ==
+=sI7U
 -----END PGP SIGNATURE-----

tests/integration/files/file/base/grail/scene33.SHA256.clearsign.asc

@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-2689de4b07720aafe8f709619f142021ae8dbdd2742a3c86701cd794f97f506c  scene33
+2cbef1330c258cd098f7cb21a6ef576bee60fad8f5aa90c6607f59009ff6c17f  scene33
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQT4zMjLXh2IaNqlhZqx+apXxJfnHAUCY9p0PAAKCRCx+apXxJfn
-HP9QBADbGuPV6iFeij6ArezoFkfp2CTUT/wX94KXeXuKGh/8o2wH3xPRx5cDj04E
-L+iU6N/MTAfVwAF+aJwRJt1pjSGWLYnUHLqxRDGRq5CTliWksLCjsV2MK0dAEU58
-952bfcFq50ECOYq316Fjg/0cizaVcqyqOtwy+2ggGloqWUjkEA==
-=LR1/
+iLMEAQEIAB0WIQTvA3ZfWe6QSTDIp4FVOoKgWMDHlQUCZVXbTQAKCRBVOoKgWMDH
+lQT+A/9tKPe5aIlRBEO40odxRefqzmkv+Dnu/utYZWs5IiY2/kcs4yaX6HLjrVnk
+L3N4hReSGcQeAqlhBbOEK6QhVdVD2O5r/QdSRSz3mWXH5CHQj1u6bldNHpqhHXfL
++5+y4MWQj/Gy1QKKnl669ksbhKiUipOYwJnFduMXvhEJgMK1zA==
+=de5O
 -----END PGP SIGNATURE-----

tests/integration/files/file/base/grail/scene33.asc

@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAAEIAB0WIQT4zMjLXh2IaNqlhZqx+apXxJfnHAUCY9p0owAKCRCx+apXxJfn
-HJVmA/0QXQ8C/+XoUqzTh94+NQ8+hwaKz44LFKAAMfGAHUdKx6qGVa0rv9nIfRJT
-O+4XgKiqOeUxtF4sXL9nNu5zuPkW3+prfEum1hAC/owm6z0O1WFvO9oFN25n/Q64
-cvuWQEXMjJHIXF2IdDKame2+JK3KHn/Ng9bxjqdg4KmlGhhajA==
-=qQmG
+iLMEAAEIAB0WIQTvA3ZfWe6QSTDIp4FVOoKgWMDHlQUCZVXasgAKCRBVOoKgWMDH
+lX1PA/0Xt/p35UGx/nV1KfHS9JDF3XNrrMdlz22IMLn5AwS1Osgu79nvsKezhSps
+9ROKrPW6g44vrpNIZ5tfgnctNUszWiaT2Ym8173cLigHaQS/tMDqVFc5YiIFrkm3
+3B6Lky1BGzDHaP6JHQgx1XWCx+x0kYATEk8MnJXx9vLk+63DNw==
+=gUqW
 -----END PGP SIGNATURE-----
 
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAAEIAB0WIQSN8J3lSrZ/YDHXHW8h5Z/XBbOHgQUCY9p02QAKCRAh5Z/XBbOH
-gRwQBAC7vGMkoDFImhwmXg98gGsaxpGY2SD7rkoN/uO1u4IWufviyDULHX2K6zxa
-bYPZpt6NPB385Vr3t7sEGu+gNapUmUrLPBFughaEdDvOkJhnQtq31kL4qoFIVGNs
-PI093+VRCQBG7cjpNMAeRRk4TlE3BtuFQwoIaKGEPhUC/VfThQ==
-=KaYP
+iLMEAAEIAB0WIQQRi0+reAOMst97aeIPbEImR0ZckwUCZVXaygAKCRAPbEImR0Zc
+kzzhBADWgiUnnGt394jdTUn8K2SMyE2Bp1jI5uRlZp3F9Fu0k+2zX8GBSGo6oEWl
+8kw8FmIdODt+OV4rl/Kg+pzElM0LzNifNTNHXHIW/nr8VFpb3tSOp8N0PpMuUXil
+fLxzbLoNi7QeKLXyTOXuKtHOU4FpyqsLR5GoiMfkfhXcwBwR7w==
+=NOUc
 -----END PGP SIGNATURE-----

tests/integration/files/file/base/grail/scene33.clearsign.asc

@@ -3,7 +3,7 @@ Hash: SHA256
 
 Scene 33
 
- 
+
       [clop clop whinny]
   KNIGHT:  They're nervous, sire.
   ARTHUR:  Then we'd best leave them here and carry on on foot.  Dis-mount!
@@ -99,9 +99,9 @@ Scene 33
       [boom]
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQT4zMjLXh2IaNqlhZqx+apXxJfnHAUCY9p0bAAKCRCx+apXxJfn
-HGt0BAC9HNKB8ticKt4xToPpiide8pa2L19msWJ9tbSp7INQiGFKU/bGBzf3Rg/j
-41BCL4L9dszcmpoa147pG3/A7UPyYzbA9fT3AvjX9Cc2OIzgmWwzSaccbZVFyctC
-Z9x6uIWrCY/AiSekoIWri4Xwi0u2TzTxRKaraHASxYzdcV111w==
-=0u4u
+iLMEAQEIAB0WIQTvA3ZfWe6QSTDIp4FVOoKgWMDHlQUCZVXajgAKCRBVOoKgWMDH
+lcyEBACSaFhfFB5wW9ipYcu0lRAsauKLvOzjutf22PqOf2bgMDWONz1TKM+saSOE
+EOcbTkDnCkEHOaJfRnWeybKokadV6N17uG7cljeCjBMX5aid8CFc5P0hAP7VtM7V
+BKd14k4VFQSrui/PzztHZzCTbrEn7pBpTMJNk7+trAj9kaRG6g==
+=pRvm
 -----END PGP SIGNATURE-----

tests/pytests/functional/states/file/test_managed.py

@@ -94,22 +94,22 @@ def a_pubkey():
     return """\
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mI0EY9pxawEEAPpBbXxRYFUm6np5h746Nch7+OrbLdtBxP8x7VDOockr/x7drssb
-llVFuK4HmiJg+Nkyakn3XmVYBHY2yBIkN/MP+R1zRxiFmniKOTD15UuHSQaWZTqh
-qac6XrLZ20BiWl1fKweCz1wGUcMZaOBs0WVB0sIupqfS90Ub93VC/+oxABEBAAG0
-JlNhbHRTdGFjayBBIFRlc3QgPGF0ZXN0QHNhbHRzdGFjay5jb20+iNEEEwEIADsW
-IQT4zMjLXh2IaNqlhZqx+apXxJfnHAUCY9pxawIbAwULCQgHAgIiAgYVCgkICwIE
-FgIDAQIeBwIXgAAKCRCx+apXxJfnHFDhA/47t5yYdCcjxXu/1Kn9sQwI+aq/S3x9
-/ZKE+RodlryqA43BUT7N6JLQ5zJO6p+kRhMwCcVfBeDNJANqVi63HEDp8q3633BF
-q1Cbi3BG0ugBdCADIETYBwl/ytMSgYwRO8b4TkYCyhWuWAgliVF3ceX0AVsng8pF
-o6Vh4A3SqosQgA==
-=eHpb
+mI0EY4fxHQEEAJvXEaaw+o/yZCwMOJbt5FQHbVMMDX/0YI8UdzsE5YCC4iKnoC3x
+FwFdkevKj3qp+45iBGLLnalfXIcVGXJGACB+tPHgsfHaXSDQPSfmX6jbZ6pHosSm
+v1tTixY+NTJzGL7hDLz2sAXTbYmTbXeE9ifWWk6NcIwZivUbhNRBM+KxABEBAAG0
+LUtleSBBIChHZW5lcmF0ZWQgYnkgU2FsdFN0YWNrKSA8a2V5YUBleGFtcGxlPojR
+BBMBCAA7FiEE7wN2X1nukEkwyKeBVTqCoFjAx5UFAmOH8R0CGy8FCwkIBwICIgIG
+FQoJCAsCBBYCAwECHgcCF4AACgkQVTqCoFjAx5XURAQAguOwI+49lG0Kby+Bsyv3
+of3GgxvhS1Qa7+ysj088az5GVt0pqVe3SbRVvn/jyC6yZvWuv94KdL3R7hCeEz2/
+JakCRJ4wxEsdeASE8t9H/oTqD0I5asMa9EMvn5ICEGeLsTeQb7OYYihTQj7HJLG6
+pDEmK8EhJDvV/9o0lnhm/9w=
+=Wc0O
 -----END PGP PUBLIC KEY BLOCK-----"""
 
 
 @pytest.fixture
 def a_fp():
-    return "F8CCC8CB5E1D8868DAA5859AB1F9AA57C497E71C"
+    return "EF03765F59EE904930C8A781553A82A058C0C795"
 
 
 @pytest.fixture
@@ -117,26 +117,26 @@ def b_pubkey():
     return """\
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mI0EY9pxigEEANbHCh566IEbp9Ez1WE3oEi+XXyf7H3GDgrVc8v9COMexpAFkJa1
-gG+yCm4bOZ5vHAXbP2rGvlOEcao3y3evj2TWahg0+05CDugRjL0pO4JcMUBV1mBZ
-ynUGoQ5T+WtKilJ5k/JrSRpJW3y//46q0g5c470qVNn9ZX0YZW/b7DFXABEBAAG0
-JlNhbHRTdGFjayBCIFRlc3QgPGJ0ZXN0QHNhbHRzdGFjay5jb20+iNEEEwEIADsW
-IQSN8J3lSrZ/YDHXHW8h5Z/XBbOHgQUCY9pxigIbAwULCQgHAgIiAgYVCgkICwIE
-FgIDAQIeBwIXgAAKCRAh5Z/XBbOHgTCuA/9mYXAehM9avvq0Jm2dVbPidqxLstki
-tgo3gCWmO1b5dXEBrhOZ8pZAktQ3WWoRrbwpNA7NAEIDF5l6uwMLLbGPQ5jreOdP
-uzHpHONR1WWAzw2dj3v+5IcLDQ4sLi9VRgJqtMasTd8TpqMCVNcMArDBiy5hRF/e
-XWEkf19Nb8qrdg==
-=OEiT
+mI0EY4fxNQEEAOgAzbpheJrOq4il5BrMVtP1G1kU94QX2+xLXEgW/wPdE4HD6Zbg
+vliIg18v7Na4x8ubWy/7CkXC83EJ8SoSqcCccvuKjIWsm6tfeCidNstNCjewFMUR
+7ZOQmAe/I2JAlz2SgNxS3ZDiCZpGkxqE0GZ+1N7Mz2WHImnExG149RVHABEBAAG0
+LUtleSBCIChHZW5lcmF0ZWQgYnkgU2FsdFN0YWNrKSA8a2V5YkBleGFtcGxlPojR
+BBMBCAA7FiEEEYtPq3gDjLLfe2niD2xCJkdGXJMFAmOH8TUCGy8FCwkIBwICIgIG
+FQoJCAsCBBYCAwECHgcCF4AACgkQD2xCJkdGXJNR3AQAk5ZoN+/ViIX3vA/LbXPn
+2VE1E7ETTeIGqsb5f98UfjIbYfkNE8+OtnPxnDbSOPWBEOT+XPPjmxnE0a2UNTfn
+ECO71/ZUiyC3ZN50IZ0vgzwBH+DeIV6PDAAun5FGx4RI7v6n0CPlrUcWKYe8wY1F
+COflOxnEyLVHXnX8wUIzZwo=
+=Hq0X
 -----END PGP PUBLIC KEY BLOCK-----"""
 
 
 @pytest.fixture
 def b_fp():
-    return "8DF09DE54AB67F6031D71D6F21E59FD705B38781"
+    return "118B4FAB78038CB2DF7B69E20F6C422647465C93"
 
 
 @pytest.fixture
-def gpg_keys_present(gnupg, a_pubkey, b_pubkey, a_fp, b_fp):
+def _gpg_keys_present(gnupg, a_pubkey, b_pubkey, a_fp, b_fp):
     pubkeys = [a_pubkey, b_pubkey]
     fingerprints = [a_fp, b_fp]
     gnupg.import_keys("\n".join(pubkeys))
@@ -922,7 +922,7 @@ def test_verify_ssl_https_source(file, tmp_path, ssl_webserver, verify_ssl):
 
 
 @pytest.mark.skipif(HAS_GNUPG is False, reason="Needs python-gnupg library")
-@pytest.mark.usefixtures("gpg_keys_present")
+@pytest.mark.usefixtures("_gpg_keys_present")
 @pytest.mark.parametrize("signature", [True, ".asc"])
 def test_file_managed_signature(
     file, tmp_path, signature, remote_grail_scene33, gpghome
@@ -951,7 +951,7 @@ def test_file_managed_signature(
 
 
 @pytest.mark.skipif(HAS_GNUPG is False, reason="Needs python-gnupg library")
-@pytest.mark.usefixtures("gpg_keys_present")
+@pytest.mark.usefixtures("_gpg_keys_present")
 def test_file_managed_signature_fail(
     file, tmp_path, remote_grail_scene33, gpghome, modules
 ):
@@ -979,7 +979,7 @@ def test_file_managed_signature_fail(
 
 
 @pytest.mark.skipif(HAS_GNUPG is False, reason="Needs python-gnupg library")
-@pytest.mark.usefixtures("gpg_keys_present")
+@pytest.mark.usefixtures("_gpg_keys_present")
 @pytest.mark.parametrize("sig", [True, ".asc"])
 def test_file_managed_source_hash_sig(
     file, tmp_path, sig, remote_grail_scene33, gpghome
@@ -1006,7 +1006,7 @@ def test_file_managed_source_hash_sig(
 
 
 @pytest.mark.skipif(HAS_GNUPG is False, reason="Needs python-gnupg library")
-@pytest.mark.usefixtures("gpg_keys_present")
+@pytest.mark.usefixtures("_gpg_keys_present")
 def test_file_managed_source_hash_sig_fail(
     file, tmp_path, remote_grail_scene33, gpghome
 ):