Skip to content

test(jetsocat): match CI feature flags in testsuite builds #1720

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

Open
Benoît Cortier (CBenoit) wants to merge 2 commits into
base: master
Choose a base branch
from
Open

test(jetsocat): match CI feature flags in testsuite builds #1720

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
5538519
test(jetsocat): match CI feature flags in testsuite builds
CBenoit Mar 19, 2026
b0e192a
.
CBenoit Mar 19, 2026
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
15 changes: 9 additions & 6 deletions testsuite/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
use std::sync::LazyLock;

static JETSOCAT_BIN_PATH: LazyLock<std::path::PathBuf> = LazyLock::new(|| {
escargot::CargoBuild::new()
let mut build = escargot::CargoBuild::new()
.manifest_path("../jetsocat/Cargo.toml")
.bin("jetsocat")
.current_release()
.current_target()
.run()
.expect("build jetsocat")
.path()
.to_path_buf()
.current_target();

// Match CI: on Windows, build with native-tls instead of the default rustls.
if cfg!(windows) {
build = build.no_default_features().features("native-tls detect-proxy");
}

build.run().expect("build jetsocat").path().to_path_buf()
});

pub fn jetsocat_assert_cmd() -> assert_cmd::Command {
Expand Down
19 changes: 5 additions & 14 deletions testsuite/tests/cli/jetsocat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,9 @@ fn doctor_no_args_is_valid() {
#[test]
fn doctor_verify_chain_with_json_output() {
// Chain checks that are expected to fail because the leaf certificate is expired.
// On Windows, both the rustls and schannel backends run and detect the expiry.
// On Windows, only the schannel backend runs (CI builds with native-tls, not rustls).
let expected_chain_failures: &[&str] = if cfg!(windows) {
&["rustls_check_chain", "schannel_check_chain"]
&["schannel_check_chain"]
} else {
&["rustls_check_chain"]
};
Expand Down Expand Up @@ -463,14 +463,10 @@ CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
#[test]
fn doctor_missing_san_and_eku() {
// Checks that are expected to fail because the certificate is missing SAN and EKU.
// The rustls end entity cert check also fails because rustls requires SAN for hostname verification.
// The schannel end entity cert check succeeds because schannel falls back to CN matching.
// On non-Windows, rustls runs: end entity cert check also fails because rustls requires SAN.
// On Windows (native-tls/schannel only), schannel end entity cert check succeeds (CN fallback).
let expected_failures: &[&str] = if cfg!(windows) {
&[
"rustls_check_end_entity_cert",
"rustls_check_chain",
"rustls_check_san_extension",
"rustls_check_server_auth_eku",
"schannel_check_chain",
"schannel_check_san_extension",
"schannel_check_server_auth_eku",
Expand All @@ -486,12 +482,7 @@ fn doctor_missing_san_and_eku() {

// Checks expected to carry a warning about TlsVerifyStrict.
let expected_warnings: &[&str] = if cfg!(windows) {
&[
"rustls_check_san_extension",
"rustls_check_server_auth_eku",
"schannel_check_san_extension",
"schannel_check_server_auth_eku",
]
&["schannel_check_san_extension", "schannel_check_server_auth_eku"]
} else {
&["rustls_check_san_extension", "rustls_check_server_auth_eku"]
};
Expand Down
Loading