mirror of
https://github.com/TrustTunnel/TrustTunnel.git
synced 2026-04-26 10:51:04 +00:00
Pull request 79: Changes for instrumented tests
Squashed commit of the following:
commit 53948bab8841c8278906cc17d6e306a2547fe908
Author: Sergey Fionov <sfionov@adguard.com>
Date: Sat Aug 2 22:53:36 2025 +0300
Use httpbin.agrd.dev instead of example.com
commit c467b86f3d680e61fcb799dcd65f010d932b7331
Author: Sergey Fionov <sfionov@adguard.com>
Date: Sat Aug 2 22:25:28 2025 +0300
Update images
commit b555b242a124f30595a30d18c3bf5a78349d9819
Author: Sergey Fionov <sfionov@adguard.com>
Date: Sat Aug 2 22:22:05 2025 +0300
Changes for intrumented tests
This commit is contained in:
Sergey Fionov
parent
b7a95f5a71
commit
b46e1e1170
11 changed files with 106 additions and 80 deletions
75
Cargo.lock
generated
75
Cargo.lock
generated
|
|
@ -1,6 +1,6 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "addr2line"
|
||||
|
|
@ -143,7 +143,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -463,6 +463,15 @@ dependencies = [
|
|||
"rusticata-macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "deranged"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
|
||||
dependencies = [
|
||||
"powerfmt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dialoguer"
|
||||
version = "0.10.4"
|
||||
|
|
@ -483,7 +492,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -640,7 +649,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1104,6 +1113,12 @@ dependencies = [
|
|||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
|
|
@ -1229,7 +1244,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1244,6 +1259,12 @@ version = "0.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "powerfmt"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.17"
|
||||
|
|
@ -1252,9 +1273,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.60"
|
||||
version = "1.0.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
|
||||
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -1721,22 +1742,22 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.164"
|
||||
version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
|
||||
checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.164"
|
||||
version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
|
||||
checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1871,9 +1892,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.18"
|
||||
version = "2.0.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
|
||||
checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1929,7 +1950,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1944,11 +1965,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.22"
|
||||
version = "0.3.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
|
||||
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"num-conv",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
|
|
@ -1956,16 +1980,17 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.1"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
|
||||
checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.9"
|
||||
version = "0.2.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
|
||||
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
|
|
@ -2021,7 +2046,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2173,7 +2198,7 @@ checksum = "8803eee176538f94ae9a14b55b2804eb7e1441f8210b1c31290b3bccdccff73b"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2402,7 +2427,7 @@ dependencies = [
|
|||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
|
|
@ -2436,7 +2461,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
"syn 2.0.43",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ stages:
|
|||
Build on Linux:
|
||||
key: BL
|
||||
docker:
|
||||
image: adguard/core-libs:2.1
|
||||
image: adguard/core-libs:2.6
|
||||
volumes:
|
||||
${bamboo.working.directory}: ${bamboo.working.directory}
|
||||
${bamboo.tmp.directory}: ${bamboo.tmp.directory}
|
||||
|
|
@ -81,7 +81,7 @@ Build on macOS:
|
|||
Deploy artifacts:
|
||||
key: DA
|
||||
docker:
|
||||
image: adguard/core-libs:2.1
|
||||
image: adguard/core-libs:2.6
|
||||
volumes:
|
||||
${bamboo.working.directory}: ${bamboo.working.directory}
|
||||
${bamboo.tmp.directory}: ${bamboo.tmp.directory}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stages:
|
|||
Increment version:
|
||||
key: JOB1
|
||||
docker:
|
||||
image: adguard/core-libs:2.1
|
||||
image: adguard/core-libs:2.6
|
||||
volumes:
|
||||
${bamboo.working.directory}: ${bamboo.working.directory}
|
||||
${bamboo.tmp.directory}: ${bamboo.tmp.directory}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stages:
|
|||
Test on Linux:
|
||||
key: TL
|
||||
docker:
|
||||
image: adguard/core-libs:2.1
|
||||
image: adguard/core-libs:2.6
|
||||
volumes:
|
||||
${bamboo.working.directory}: ${bamboo.working.directory}
|
||||
${bamboo.tmp.directory}: ${bamboo.tmp.directory}
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ name = "vpn_endpoint"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
clap = "=4.3.8"
|
||||
console-subscriber = { version = "=0.1.9", optional = true }
|
||||
log = "=0.4.19"
|
||||
sentry = { version = "=0.31.5", default-features = false, features = ["backtrace", "panic", "reqwest", "rustls", "contexts"] }
|
||||
tokio = { version = "=1.28.2", features = ["rt-multi-thread", "signal"] }
|
||||
toml = { version = "=0.7.4", default-features = false, features = ["parse"] }
|
||||
clap = "4.3.8"
|
||||
console-subscriber = { version = "0.1.9", optional = true }
|
||||
log = "0.4.19"
|
||||
sentry = { version = "0.31.5", default-features = false, features = ["backtrace", "panic", "reqwest", "rustls", "contexts"] }
|
||||
tokio = { version = "1.28.2", features = ["rt-multi-thread", "signal"] }
|
||||
toml = { version = "0.7.4", default-features = false, features = ["parse"] }
|
||||
vpn_libs_endpoint = { version = "0.1", path = "../lib" }
|
||||
|
||||
[features]
|
||||
|
|
|
|||
|
|
@ -10,38 +10,39 @@ path = "src/lib.rs"
|
|||
doctest = false
|
||||
|
||||
[build-dependencies]
|
||||
cc = "=1.0.79"
|
||||
cc = "1.0.79"
|
||||
|
||||
[dependencies]
|
||||
async-trait = "=0.1.68"
|
||||
base64 = "=0.21.2"
|
||||
bytes = "=1.4.0"
|
||||
chrono = { version = "=0.4.26", default-features = false, features = ["clock"] }
|
||||
dynfmt = { version = "=0.1.5", features = ["curly"], default-features = false }
|
||||
futures = "=0.3.28"
|
||||
h2 = "=0.3.20"
|
||||
http = "=0.2.9"
|
||||
httparse = "=1.8.0"
|
||||
lazy_static = "=1.4.0"
|
||||
libc = "=0.2.147"
|
||||
log = "=0.4.19"
|
||||
async-trait = "0.1.68"
|
||||
base64 = "0.21.2"
|
||||
bytes = "1.4.0"
|
||||
chrono = { version = "0.4.26", default-features = false, features = ["clock"] }
|
||||
dynfmt = { version = "0.1.5", features = ["curly"], default-features = false }
|
||||
futures = "0.3.28"
|
||||
h2 = "0.3.20"
|
||||
http = "0.2.9"
|
||||
httparse = "1.8.0"
|
||||
lazy_static = "1.4.0"
|
||||
libc = "0.2.147"
|
||||
log = "0.4.19"
|
||||
macros = { version = "0.1.0", path = "../macros", optional = true }
|
||||
once_cell = "=1.18.0"
|
||||
prometheus = { version = "=0.13.3", features = ["process"] }
|
||||
quiche = { version = "=0.17.2", features = ["qlog"] }
|
||||
ring = "=0.16.20"
|
||||
rustls = { version = "=0.21.2", features = ["logging"] }
|
||||
rustls-pemfile = "=1.0.2"
|
||||
serde = "=1.0.164"
|
||||
smallvec = "=1.10.0"
|
||||
tokio = { version = "=1.28.2", features = ["net", "rt", "sync", "time", "macros", "rt-multi-thread"] }
|
||||
tokio-rustls = "=0.24.1"
|
||||
toml_edit = "=0.19.10"
|
||||
once_cell = "1.18.0"
|
||||
prometheus = { version = "0.13.3", features = ["process"] }
|
||||
quiche = { version = "0.17.2", features = ["qlog"] }
|
||||
ring = "0.16.20"
|
||||
rustls = { version = "0.21.2", features = ["logging"] }
|
||||
rustls-pemfile = "1.0.2"
|
||||
serde = "1.0.164"
|
||||
smallvec = "1.10.0"
|
||||
tokio = { version = "1.28.2", features = ["net", "rt", "sync", "time", "macros", "rt-multi-thread"] }
|
||||
tokio-rustls = "0.24.1"
|
||||
toml_edit = "0.19.10"
|
||||
|
||||
[dev-dependencies]
|
||||
hyper = { version = "=0.14.26", features = ["http1", "http2", "client", "server", "runtime", "stream"] }
|
||||
rustls = { version = "=0.21.2", features = ["logging", "dangerous_configuration"] }
|
||||
hyper = { version = "0.14.26", features = ["http1", "http2", "client", "server", "runtime", "stream"] }
|
||||
rustls = { version = "0.21.2", features = ["logging", "dangerous_configuration"] }
|
||||
|
||||
[features]
|
||||
rt_doc = ["dep:macros"]
|
||||
tracing = ["tokio/tracing"]
|
||||
default = ["rt_doc"]
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ mod tests {
|
|||
fn check_protocol_selection(listen_protocols: ListenProtocolSettings, advertised_protocols: Vec<Protocol>)
|
||||
-> Result<ConnectionMeta, String>
|
||||
{
|
||||
const TEST_HOST: &str = "example.com";
|
||||
const TEST_HOST: &str = "httpbin.agrd.dev";
|
||||
|
||||
let mut settings = Settings::default();
|
||||
settings.listen_protocols = listen_protocols;
|
||||
|
|
@ -402,7 +402,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn reverse_proxy_protocol_selection() {
|
||||
const TEST_HOST: &str = "example.com";
|
||||
const TEST_HOST: &str = "httpbin.agrd.dev";
|
||||
|
||||
let mut settings = Settings::default();
|
||||
settings.reverse_proxy = Some(dummy_reverse_proxy_settings());
|
||||
|
|
@ -421,7 +421,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn ping_protocol_selection() {
|
||||
const TEST_HOST: &str = "example.com";
|
||||
const TEST_HOST: &str = "httpbin.agrd.dev";
|
||||
|
||||
let mut tls_settings = TlsHostsSettings::default();
|
||||
tls_settings.ping_hosts = vec![make_tls_host(TEST_HOST.to_string())];
|
||||
|
|
@ -438,7 +438,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn speedtest_protocol_selection() {
|
||||
const TEST_HOST: &str = "example.com";
|
||||
const TEST_HOST: &str = "httpbin.agrd.dev";
|
||||
|
||||
let mut tls_settings = TlsHostsSettings::default();
|
||||
tls_settings.speedtest_hosts = vec![make_tls_host(TEST_HOST.to_string())];
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ async fn do_connect_request(
|
|||
let mut rr = Request::builder()
|
||||
.version(http::Version::HTTP_11)
|
||||
.method(http::Method::CONNECT)
|
||||
.uri("https://example.com:443/");
|
||||
.uri("https://httpbin.agrd.dev:443/");
|
||||
|
||||
if let Some(x) = proxy_auth {
|
||||
rr = rr.header(
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@ edition = "2021"
|
|||
proc-macro = true
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "=1.0.60"
|
||||
quote = "=1.0.28"
|
||||
syn = "=1.0.109"
|
||||
proc-macro2 = "1.0.60"
|
||||
quote = "1.0.28"
|
||||
syn = "1.0.109"
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
[toolchain]
|
||||
channel = "1.77"
|
||||
channel = "1.85"
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@ name = "setup_wizard"
|
|||
path = "setup_wizard/main.rs"
|
||||
|
||||
[dependencies]
|
||||
chrono = { version = "=0.4.26", default-features = false, features = ["clock"] }
|
||||
clap = "=4.3.8"
|
||||
dialoguer = "=0.10.4"
|
||||
lazy_static = "=1.4.0"
|
||||
once_cell = "=1.18.0"
|
||||
rcgen = "=0.10.0"
|
||||
serde = "=1.0.164"
|
||||
toml = "=0.7.4"
|
||||
toml_edit = "=0.19.10"
|
||||
chrono = { version = "0.4.26", default-features = false, features = ["clock"] }
|
||||
clap = "4.3.8"
|
||||
dialoguer = "0.10.4"
|
||||
lazy_static = "1.4.0"
|
||||
once_cell = "1.18.0"
|
||||
rcgen = "0.10.0"
|
||||
serde = "1.0.164"
|
||||
toml = "0.7.4"
|
||||
toml_edit = "0.19.10"
|
||||
vpn_libs_endpoint = { version = "0.1", path = "../lib", features = ["rt_doc"] }
|
||||
x509-parser = "=0.15.0"
|
||||
x509-parser = "0.15.0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue