openpgp: Improve tests with marker packets.

1 files changed, 16 insertions, 2 deletions

diff --git a/openpgp/src/parse.rs b/openpgp/src/parse.rs
index c7912584..9c365420 100644
--- a/openpgp/src/parse.rs
+++ b/openpgp/src/parse.rs
@@ -5762,14 +5762,27 @@ mod test {
 
     #[test]
     fn message_validator() {
+      for marker in 0..4 {
+        let marker_before = marker & 1 > 0;
+        let marker_after = marker & 2 > 0;
+
         for test in DECRYPT_TESTS.iter() {
             if !test.algo.is_supported() {
                 eprintln!("Algorithm {} unsupported, skipping", test.algo);
                 continue;
             }
 
-            let mut ppr = PacketParserBuilder::from_bytes(
-                crate::tests::message(test.filename)).unwrap()
+            let mut buf = Vec::new();
+            if marker_before {
+                Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
+            }
+            buf.extend_from_slice(crate::tests::message(test.filename));
+            if marker_after {
+                Packet::Marker(Default::default()).serialize(&mut buf).unwrap();
+            }
+
+            let mut ppr = PacketParserBuilder::from_bytes(&buf)
+                .unwrap()
                 .build()
                 .expect(&format!("Error reading {}", test.filename)[..]);
 
@@ -5800,6 +5813,7 @@ mod test {
                 unreachable!();
             }
         }
+      }
     }
 
     #[test]