Skip to content

Commit

Permalink
Merge branch 'eichhorl/filedownloader-unit-tests' into 'master'
Browse files Browse the repository at this point in the history 
test(http_utils): CON-1183 Add unit tests for `FileDownloader`

 

See merge request dfinity-lab/public/ic!16629
  • Loading branch information
@eichhorl
eichhorl committed Dec 12, 2023
2 parents 3d97902 + 2942356 commit ced121d
Show file tree
Hide file tree
Showing 10 changed files with 474 additions and 15 deletions.
93 changes: 92 additions & 1 deletion Cargo.Bazel.Fuzzing.json.lock
View file
@@ -1,5 +1,5 @@
{
"checksum": "f6e95aa4588036f20923951375aa3f5ab06a875c95204667a6d093cd0f858bef",
"checksum": "06e49bd4aa9720bd84debde5ada945567976284611aa4d08d6386023fc9d517a",
"crates": {
"abnf 0.12.0": {
"name": "abnf",
Expand Down Expand Up @@ -14308,6 +14308,10 @@
"id": "mockall 0.11.4",
"target": "mockall"
},
{
"id": "mockito 1.2.0",
"target": "mockito"
},
{
"id": "moka 0.12.1",
"target": "moka"
Expand Down Expand Up @@ -30970,6 +30974,93 @@
},
"license": "MIT/Apache-2.0"
},
"mockito 1.2.0": {
"name": "mockito",
"version": "1.2.0",
"repository": {
"Http": {
"url": "https://crates.io/api/v1/crates/mockito/1.2.0/download",
"sha256": "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b"
}
},
"targets": [
{
"Library": {
"crate_name": "mockito",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "mockito",
"common_attrs": {
"compile_data_glob": [
"**"
],
"crate_features": {
"common": [
"color",
"colored",
"default"
],
"selects": {}
},
"deps": {
"common": [
{
"id": "assert-json-diff 2.0.2",
"target": "assert_json_diff"
},
{
"id": "colored 2.0.4",
"target": "colored"
},
{
"id": "futures 0.3.28",
"target": "futures"
},
{
"id": "hyper 0.14.27",
"target": "hyper"
},
{
"id": "log 0.4.20",
"target": "log"
},
{
"id": "rand 0.8.5",
"target": "rand"
},
{
"id": "regex 1.10.2",
"target": "regex"
},
{
"id": "serde_json 1.0.107",
"target": "serde_json"
},
{
"id": "serde_urlencoded 0.7.1",
"target": "serde_urlencoded"
},
{
"id": "similar 2.3.0",
"target": "similar"
},
{
"id": "tokio 1.33.0",
"target": "tokio"
}
],
"selects": {}
},
"edition": "2021",
"version": "1.2.0"
},
"license": "MIT"
},
"moka 0.12.1": {
"name": "moka",
"version": "0.12.1",
Expand Down
20 changes: 20 additions & 0 deletions Cargo.Bazel.Fuzzing.toml.lock
View file
Expand Up @@ -2823,6 +2823,7 @@ dependencies = [
"minicbor",
"minicbor-derive",
"mockall",
"mockito",
"moka",
"nix 0.24.3",
"notify",
Expand Down Expand Up @@ -6092,6 +6093,25 @@ dependencies = [
"syn 1.0.109",
]

[[package]]
name = "mockito"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b"
dependencies = [
"assert-json-diff",
"colored",
"futures",
"hyper 0.14.27",
"log",
"rand 0.8.5",
"regex",
"serde_json",
"serde_urlencoded",
"similar",
"tokio",
]

[[package]]
name = "moka"
version = "0.12.1"
Expand Down
93 changes: 92 additions & 1 deletion Cargo.Bazel.json.lock
View file
@@ -1,5 +1,5 @@
{
"checksum": "30bfaa28584585def5ca7e1d062a015f0e5e0856781e405490d4d9b5741529c2",
"checksum": "20b7bc536ff18d36a1e1b1f35b9618cff4a2fef7ecf1f061ab0b004212e2afb0",
"crates": {
"abnf 0.12.0": {
"name": "abnf",
Expand Down Expand Up @@ -14161,6 +14161,10 @@
"id": "mockall 0.11.4",
"target": "mockall"
},
{
"id": "mockito 1.2.0",
"target": "mockito"
},
{
"id": "moka 0.12.1",
"target": "moka"
Expand Down Expand Up @@ -30868,6 +30872,93 @@
},
"license": "MIT/Apache-2.0"
},
"mockito 1.2.0": {
"name": "mockito",
"version": "1.2.0",
"repository": {
"Http": {
"url": "https://crates.io/api/v1/crates/mockito/1.2.0/download",
"sha256": "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b"
}
},
"targets": [
{
"Library": {
"crate_name": "mockito",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "mockito",
"common_attrs": {
"compile_data_glob": [
"**"
],
"crate_features": {
"common": [
"color",
"colored",
"default"
],
"selects": {}
},
"deps": {
"common": [
{
"id": "assert-json-diff 2.0.2",
"target": "assert_json_diff"
},
{
"id": "colored 2.0.4",
"target": "colored"
},
{
"id": "futures 0.3.28",
"target": "futures"
},
{
"id": "hyper 0.14.27",
"target": "hyper"
},
{
"id": "log 0.4.20",
"target": "log"
},
{
"id": "rand 0.8.5",
"target": "rand"
},
{
"id": "regex 1.9.1",
"target": "regex"
},
{
"id": "serde_json 1.0.108",
"target": "serde_json"
},
{
"id": "serde_urlencoded 0.7.1",
"target": "serde_urlencoded"
},
{
"id": "similar 2.2.1",
"target": "similar"
},
{
"id": "tokio 1.32.0",
"target": "tokio"
}
],
"selects": {}
},
"edition": "2021",
"version": "1.2.0"
},
"license": "MIT"
},
"moka 0.12.1": {
"name": "moka",
"version": "0.12.1",
Expand Down
20 changes: 20 additions & 0 deletions Cargo.Bazel.toml.lock
View file
Expand Up @@ -2812,6 +2812,7 @@ dependencies = [
"minicbor",
"minicbor-derive",
"mockall",
"mockito",
"moka",
"nix 0.24.3",
"notify",
Expand Down Expand Up @@ -6081,6 +6082,25 @@ dependencies = [
"syn 1.0.109",
]

[[package]]
name = "mockito"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b"
dependencies = [
"assert-json-diff",
"colored",
"futures",
"hyper 0.14.27",
"log",
"rand 0.8.5",
"regex",
"serde_json",
"serde_urlencoded",
"similar",
"tokio",
]

[[package]]
name = "moka"
version = "0.12.1"
Expand Down
23 changes: 23 additions & 0 deletions Cargo.lock
View file

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

1 change: 1 addition & 0 deletions Cargo.toml
View file
Expand Up @@ -460,6 +460,7 @@ k256 = { version = "0.13.2", default_features = false, features = [
"std",
] }
mockall = "0.11.4"
mockito = "1.2.0"
minicbor = { version = "0.19.1", features = ["alloc", "derive"] }
minicbor-derive = "0.13.0"
nix = "0.24.3"
Expand Down
3 changes: 3 additions & 0 deletions bazel/external_crates.bzl
View file
Expand Up @@ -692,6 +692,9 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
"mockall": crate.spec(
version = "^0.11.4",
),
"mockito": crate.spec(
version = "^1.2.0",
),
"moka": crate.spec(
version = "^0.12",
features = [
Expand Down

0 comments on commit ced121d

Please sign in to comment.