Skip to content

Add Test::write_keypair() helper #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
casey merged 1 commit into from
Aug 14, 2026
Merged

Add Test::write_keypair() helper #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tests/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,8 @@ fn non_unicode_path_error() {
fn private_key_load_error_message() {
Test::new()
.touch("foo/bar")
.touch("keychain/master.private")
.write("keychain/master.public", PUBLIC_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/master.private", 0o600)
.write_keypair("master")
.write("keychain/master.private", "")
.args(["create", "--sign", "foo"])
.stderr_regex("error: invalid private key `.*master.private`.*failed to decode bech32.*")
.failure();
Expand Down
10 changes: 2 additions & 8 deletions tests/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@ fn delete_package_succeeds() {
#[test]
fn restricted_delete_succeeds_with_auth() {
let server = Test::new()
.write("keychain/master.public", PUBLIC_KEY)
.write("keychain/master.private", PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/master.private", 0o600)
.write_keypair("master")
.ready_address()
.args([
"serve",
Expand All @@ -94,10 +91,7 @@ fn restricted_delete_succeeds_with_auth() {
.spawn();

let test = Test::new()
.write("keychain/master.public", PUBLIC_KEY)
.write("keychain/master.private", PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/master.private", 0o600)
.write_keypair("master")
.write("pkg/foo", "bar")
.args(["create", "pkg"])
.success();
Expand Down
14 changes: 5 additions & 9 deletions tests/keychain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ fn hidden_files_are_ignored() {
#[test]
fn invalid_key_name() {
Test::new()
.write("keychain/INVALID.public", PUBLIC_KEY)
.write("keychain/INVALID.private", PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/INVALID.private", 0o600)
.write_keypair("INVALID")
.arg("info")
.stderr_regex("error: invalid key name: `.*INVALID.private`\n.*")
.failure();
Expand All @@ -50,8 +47,8 @@ fn invalid_public_key() {
#[test]
fn missing_private_key_error() {
Test::new()
.write("keychain/orphan.public", PUBLIC_KEY)
.chmod("keychain", 0o700)
.write_keypair("orphan")
.remove_file("keychain/orphan.private")
.arg("info")
.stderr_regex("error: private key not found: `.*orphan.private`\n")
.failure();
Expand All @@ -60,9 +57,8 @@ fn missing_private_key_error() {
#[test]
fn missing_public_key_error() {
Test::new()
.write("keychain/foo.private", PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/foo.private", 0o600)
.write_keypair("foo")
.remove_file("keychain/foo.public")
.arg("info")
.stderr_regex("error: public key not found: `.*foo.public`\n")
.failure();
Expand Down
5 changes: 1 addition & 4 deletions tests/keygen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ fn invalid_name() {
#[test]
fn key_already_exists() {
Test::new()
.write("keychain/master.private", PRIVATE_KEY)
.write("keychain/master.public", PUBLIC_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/master.private", 0o700)
.write_keypair("master")
.arg("keygen")
.stderr_regex("error: public key already exists: `.*master.public`\n")
.failure();
Expand Down
8 changes: 8 additions & 0 deletions tests/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,14 @@ impl Test {
self
}

pub(crate) fn write_keypair(self, name: &str) -> Self {
self
.write(&format!("keychain/{name}.public"), PUBLIC_KEY)
.write(&format!("keychain/{name}.private"), PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod(&format!("keychain/{name}.private"), 0o600)
}

pub(crate) fn write_manifest(self, path: &str, json: impl AsRef<str>) -> Self {
let mut tempfile = NamedTempFile::new().unwrap();

Expand Down
15 changes: 3 additions & 12 deletions tests/upload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ use super::*;
#[test]
fn restricted_upload_succeeds_with_auth() {
let server = Test::new()
.write("keychain/master.public", PUBLIC_KEY)
.write("keychain/master.private", PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/master.private", 0o600)
.write_keypair("master")
.assert_file(&format!("files/{}", Hash::bytes(b"bar")), "bar")
.ready_address()
.args([
Expand All @@ -24,10 +21,7 @@ fn restricted_upload_succeeds_with_auth() {
.spawn();

Test::new()
.write("keychain/master.public", PUBLIC_KEY)
.write("keychain/master.private", PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/master.private", 0o600)
.write_keypair("master")
.write("foo", "bar")
.args([
"upload",
Expand Down Expand Up @@ -91,10 +85,7 @@ fn reupload_succeeds() {
#[test]
fn serve_admin_key_by_name() {
let server = Test::new()
.write("keychain/master.public", PUBLIC_KEY)
.write("keychain/master.private", PRIVATE_KEY)
.chmod("keychain", 0o700)
.chmod("keychain/master.private", 0o600)
.write_keypair("master")
.ready_address()
.args([
"serve",
Expand Down