Skip to content
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

Jump to bottom

Reorganize e2e tests #371

Merged
merged 2 commits into from
Jul 14, 2023
Merged

Reorganize e2e tests #371

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
365732c
Reorganize e2e tests
mendess Jul 14, 2023
822b3c3
cleanup test naming
mendess Jul 14, 2023
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
91 changes: 91 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ members = [
opt-level = "s"

[workspace.dependencies]
anyhow = "1.0.71"
assert_matches = "1.5.0"
async-trait = "0.1.71"
base64 = "0.21.2"
criterion = { version = "0.5.1", features = ["async_tokio"] }
futures = "0.3.28"
getrandom = { version = "0.2.10", features = ["js"] } # Required for prio
Expand Down
2 changes: 1 addition & 1 deletion daphne/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ harness = false
[dependencies]
assert_matches.workspace = true
async-trait.workspace = true
base64 = "0.21.2"
base64.workspace = true
futures.workspace = true
hex.workspace = true
hpke-rs = { workspace = true, features = ["hazmat", "serialization"] }
Expand Down
5 changes: 4 additions & 1 deletion daphne_worker_test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ crate-type = ["cdylib", "rlib"]
[features]
default = ["console_error_panic_hook"]
test_e2e = []
test_acceptance = []

[dependencies]
cfg-if = "1.0.0"
Expand All @@ -29,14 +30,16 @@ tracing.workspace = true
worker.workspace = true

[dev-dependencies]
async-trait.workspace = true
assert_matches.workspace = true
daphne = { path = "../daphne" }
hex.workspace = true
hpke-rs.workspace = true
paste.workspace = true
prio.workspace = true
prometheus.workspace = true
rand.workspace = true
reqwest = { workspace = true, features = ["json"] }
reqwest = { workspace = true, features = ["json", "rustls-tls"] }
ring.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand Down
9 changes: 7 additions & 2 deletions daphne_worker_test/docker/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@

set -e

echo "Running tests."
env RUST_BACKTRACE=1 cargo test --features=test_e2e -p daphne-worker-test -- --nocapture --test-threads 1
echo "Running e2e tests."
env RUST_BACKTRACE=1 cargo test \
--features=test_e2e \
-- \
--nocapture \
--test-threads 1 \
e2e

echo "Running clippy."
cargo clippy -- -Dwarnings
Loading
Loading