diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-01-17 13:37:27 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-01-17 13:40:16 +0100 |
| commit | 18fca715c8adc5d826114f923968e11bdec9e9cd (patch) | |
| tree | 7a5f834aeebcb95b46f4130b3b269e339ca17e20 /sqv | |
| parent | b6df16e949090470daccded88b1884a439566fa4 (diff) | |
sqv: Relax test.
- Don't match on "predates" in stderr. If the signing key is
selected using the signature's creation time, the key selection
will fail, possibly producing a different error message.
Diffstat (limited to 'sqv')
| -rw-r--r-- | sqv/tests/revoked-key.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs index a37f30ae..36fb7457 100644 --- a/sqv/tests/revoked-key.rs +++ b/sqv/tests/revoked-key.rs @@ -75,12 +75,12 @@ mod integration { #[test] fn not_revoked() { let c = "not-revoked"; - f0(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f0(c, "t0").fails().unwrap(); f0(c, "t1-t2").unwrap(); f0(c, "t2-t3").unwrap(); f0(c, "t3-now").unwrap(); - f1(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f1(c, "t0").fails().unwrap(); f1(c, "t1-t2").fails().unwrap(); f1(c, "t2-t3").unwrap(); f1(c, "t3-now").unwrap(); @@ -190,17 +190,17 @@ mod integration { #[test] fn revoked_superseded() { let c = "revoked-superseded"; - f0(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f0(c, "t0").fails().unwrap(); f0(c, "t1-t2").unwrap(); f0(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f0(c, "t3-now").unwrap(); - f1(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f1(c, "t0").fails().unwrap(); f1(c, "t1-t2").fails().unwrap(); f1(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f1(c, "t3-now").unwrap(); - f2(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f2(c, "t0").fails().unwrap(); f2(c, "t1-t2").fails().unwrap(); f2(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f2(c, "t3-now").unwrap(); @@ -209,17 +209,17 @@ mod integration { #[test] fn revoked_key_retired() { let c = "revoked-key_retired"; - f0(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f0(c, "t0").fails().unwrap(); f0(c, "t1-t2").unwrap(); f0(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f0(c, "t3-now").unwrap(); - f1(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f1(c, "t0").fails().unwrap(); f1(c, "t1-t2").fails().unwrap(); f1(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f1(c, "t3-now").unwrap(); - f2(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f2(c, "t0").fails().unwrap(); f2(c, "t1-t2").fails().unwrap(); f2(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f2(c, "t3-now").unwrap(); @@ -229,17 +229,17 @@ mod integration { #[test] fn revoked_uid_retired() { let c = "revoked-uid_retired"; - f0(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f0(c, "t0").fails().unwrap(); f0(c, "t1-t2").unwrap(); f0(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f0(c, "t3-now").unwrap(); - f1(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f1(c, "t0").fails().unwrap(); f1(c, "t1-t2").fails().unwrap(); f1(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f1(c, "t3-now").unwrap(); - f2(c, "t0").fails().and().stderr().contains("predates").unwrap(); + f2(c, "t0").fails().unwrap(); f2(c, "t1-t2").fails().unwrap(); f2(c, "t2-t3").fails().and().stderr().contains("revoked").unwrap(); f2(c, "t3-now").unwrap(); |