diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2018-11-26 22:39:31 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2018-11-26 23:18:45 +0100 |
| commit | b08498fae6c3bd87fd3c2b3bcadac0dd10d3d351 (patch) | |
| tree | f49cea933f4fcd2440a756edf1ae2899a0d498f4 /sqv | |
| parent | 8c096d156df3862240e7dfdb560974ddb8064aa1 (diff) | |
sqv: Fix tests.
- Fixes 64addd3eaa0c6902928b2eaab1db20b6c2ec8fa2, which removes the
short alias for --keyring.
Diffstat (limited to 'sqv')
| -rw-r--r-- | sqv/tests/bad-subkey.rs | 2 | ||||
| -rw-r--r-- | sqv/tests/duplicate-signatures.rs | 4 | ||||
| -rw-r--r-- | sqv/tests/multiple-signatures.rs | 2 | ||||
| -rw-r--r-- | sqv/tests/not-before-after.rs | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sqv/tests/bad-subkey.rs b/sqv/tests/bad-subkey.rs index 6a6b7fc7..436648bd 100644 --- a/sqv/tests/bad-subkey.rs +++ b/sqv/tests/bad-subkey.rs @@ -10,7 +10,7 @@ mod integration { fn bad_subkey() { Assert::cargo_binary("sqv") .current_dir(path::Path::new("tests").join("data")) - .with_args(&["-r", "bad-subkey-keyring.pgp", + .with_args(&["--keyring", "bad-subkey-keyring.pgp", "bad-subkey.txt.sig", "bad-subkey.txt"]) .stdout().is("8F17 7771 18A3 3DDA 9BA4 8E62 AACB 3243 6300 52D9") .unwrap(); diff --git a/sqv/tests/duplicate-signatures.rs b/sqv/tests/duplicate-signatures.rs index 691afb50..c91df964 100644 --- a/sqv/tests/duplicate-signatures.rs +++ b/sqv/tests/duplicate-signatures.rs @@ -12,7 +12,7 @@ fn ignore_duplicates() { // Duplicate is ignored, but remaining one is ok. Assert::cargo_binary("sqv") .with_args( - &["-r", + &["--keyring", &p("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp"), &p("messages/a-cypherpunks-manifesto.txt.ed25519.sig.duplicated"), &p("messages/a-cypherpunks-manifesto.txt")]) @@ -21,7 +21,7 @@ fn ignore_duplicates() { // Duplicate is ignored, and fails to meet the threshold. Assert::cargo_binary("sqv") .with_args( - &["-r", + &["--keyring", &p("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp"), "--signatures=2", &p("messages/a-cypherpunks-manifesto.txt.ed25519.sig.duplicated"), diff --git a/sqv/tests/multiple-signatures.rs b/sqv/tests/multiple-signatures.rs index a2bff844..3c0aa81c 100644 --- a/sqv/tests/multiple-signatures.rs +++ b/sqv/tests/multiple-signatures.rs @@ -14,7 +14,7 @@ fn ignore_multiple_signatures() { // meet the threshold. Assert::cargo_binary("sqv") .with_args( - &["-r", + &["--keyring", &p("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp"), "--signatures=2", &p("messages/a-cypherpunks-manifesto.txt.ed25519.sig.duplicated"), diff --git a/sqv/tests/not-before-after.rs b/sqv/tests/not-before-after.rs index 5be41bf0..1bae9d06 100644 --- a/sqv/tests/not-before-after.rs +++ b/sqv/tests/not-before-after.rs @@ -12,7 +12,7 @@ mod integration { fn unconstrained() { Assert::cargo_binary("sqv") .with_args( - &["-r", + &["--keyring", &p("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp"), &p("messages/a-cypherpunks-manifesto.txt.ed25519.sig"), &p("messages/a-cypherpunks-manifesto.txt")]) @@ -24,7 +24,7 @@ mod integration { fn in_interval() { Assert::cargo_binary("sqv") .with_args( - &["-r", + &["--keyring", &p("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp"), "--not-before", "2018-08-14", "--not-after", "2018-08-15", @@ -38,7 +38,7 @@ mod integration { fn before() { Assert::cargo_binary("sqv") .with_args( - &["-r", + &["--keyring", &p("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp"), "--not-before", "2018-08-15", &p("messages/a-cypherpunks-manifesto.txt.ed25519.sig"), @@ -51,7 +51,7 @@ mod integration { fn after() { Assert::cargo_binary("sqv") .with_args( - &["-r", + &["--keyring", &p("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp"), "--not-after", "2018-08-14", &p("messages/a-cypherpunks-manifesto.txt.ed25519.sig"), |