Skip to content

Fix tests following additive feature changes #450

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanGould merged 2 commits into from
Jan 2, 2025
Merged

Fix tests following additive feature changes #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62510c7
Test _danger-local-https only for v2 integration
DanGould Jan 1, 2025
4538929
Include io in v2 integration test requirement
DanGould Jan 1, 2025
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
2 changes: 1 addition & 1 deletion payjoin/contrib/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set -e

cargo test --locked --package payjoin --verbose --all-features --lib
cargo test --locked --package payjoin --verbose --features=send,receive --test integration
cargo test --locked --package payjoin --verbose --no-default-features --features=send,receive,_danger-local-https,v2 --test integration
cargo test --locked --package payjoin --verbose --no-default-features --features=send,receive,_danger-local-https,v2,io --test integration
Copy link
Copy Markdown
Contributor

@nothingmuch nothingmuch Jan 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we want to use https://github.com/frewsxcv/cargo-all-features instead of manually enumerating feature combinations? if so then in followup

Copy link
Copy Markdown
Contributor Author

@DanGould DanGould Jan 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That should work

4 changes: 2 additions & 2 deletions payjoin/tests/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#[cfg(all(feature = "send", feature = "receive", feature = "_danger-local-https"))]
#[cfg(all(feature = "send", feature = "receive"))]
mod integration {
use std::collections::HashMap;
use std::env;
Expand Down Expand Up @@ -171,7 +171,7 @@ mod integration {
}
}

#[cfg(all(feature = "io", feature = "v2"))]
#[cfg(all(feature = "io", feature = "v2", feature = "_danger-local-https"))]
mod v2 {
use std::sync::Arc;
use std::time::Duration;
Expand Down