test(e2e): disable embedded console on raw rustfs spawn sites (#4617)

This commit is contained in:
Zhengchao An
2026-07-09 20:37:18 +08:00
committed by GitHub
parent 52529403a6
commit cae6189744
5 changed files with 8 additions and 2 deletions
+1
View File
@@ -56,6 +56,7 @@ async fn start_rustfs_with_compression(env: &mut RustFSTestEnvironment) -> Resul
let binary_path = rustfs_binary_path(); let binary_path = rustfs_binary_path();
let process = Command::new(&binary_path) let process = Command::new(&binary_path)
.env("RUSTFS_CONSOLE_ENABLE", "false")
.env("RUSTFS_COMPRESSION_ENABLED", "true") .env("RUSTFS_COMPRESSION_ENABLED", "true")
.args([ .args([
"--address", "--address",
@@ -102,6 +102,7 @@ pub async fn test_ftps_core_operations() -> Result<()> {
info!("Starting FTPS server on {}", FTPS_ADDRESS); info!("Starting FTPS server on {}", FTPS_ADDRESS);
let binary_path = rustfs_binary_path_with_features(Some("ftps,webdav")); let binary_path = rustfs_binary_path_with_features(Some("ftps,webdav"));
let mut server_process = Command::new(&binary_path) let mut server_process = Command::new(&binary_path)
.env("RUSTFS_CONSOLE_ENABLE", "false")
.env("RUSTFS_FTPS_ENABLE", "true") .env("RUSTFS_FTPS_ENABLE", "true")
.env("RUSTFS_FTPS_ADDRESS", FTPS_ADDRESS) .env("RUSTFS_FTPS_ADDRESS", FTPS_ADDRESS)
.env("RUSTFS_FTPS_CERTS_DIR", cert_dir.to_str().unwrap()) .env("RUSTFS_FTPS_CERTS_DIR", cert_dir.to_str().unwrap())
@@ -192,6 +192,7 @@ pub(crate) async fn spawn_compliance_rustfs(
.to_str() .to_str()
.ok_or_else(|| anyhow!("host key dir path is not utf-8: {}", host_key_dir.display()))?; .ok_or_else(|| anyhow!("host key dir path is not utf-8: {}", host_key_dir.display()))?;
let child = Command::new(&binary_path) let child = Command::new(&binary_path)
.env(ENV_CONSOLE_ENABLE, "false")
.env(ENV_SFTP_ENABLE, "true") .env(ENV_SFTP_ENABLE, "true")
.env(ENV_SFTP_ADDRESS, sftp_address) .env(ENV_SFTP_ADDRESS, sftp_address)
.env(ENV_SFTP_HOST_KEY_DIR, host_key_dir_str) .env(ENV_SFTP_HOST_KEY_DIR, host_key_dir_str)
+4 -2
View File
@@ -27,8 +27,8 @@ use russh::client::{self, Handle};
use russh_sftp::client::SftpSession; use russh_sftp::client::SftpSession;
use russh_sftp::protocol::{FileAttributes, OpenFlags}; use russh_sftp::protocol::{FileAttributes, OpenFlags};
use rustfs_config::{ use rustfs_config::{
ENV_RUSTFS_ADDRESS, ENV_SFTP_ADDRESS, ENV_SFTP_ENABLE, ENV_SFTP_HOST_KEY_DIR, ENV_SFTP_IDLE_TIMEOUT, ENV_SFTP_PART_SIZE, ENV_CONSOLE_ENABLE, ENV_RUSTFS_ADDRESS, ENV_SFTP_ADDRESS, ENV_SFTP_ENABLE, ENV_SFTP_HOST_KEY_DIR, ENV_SFTP_IDLE_TIMEOUT,
ENV_SFTP_READ_ONLY, ENV_SFTP_PART_SIZE, ENV_SFTP_READ_ONLY,
}; };
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use std::path::PathBuf; use std::path::PathBuf;
@@ -152,6 +152,7 @@ pub async fn test_sftp_core_operations() -> Result<()> {
.ok_or_else(|| anyhow!("host key dir path is not utf-8"))?; .ok_or_else(|| anyhow!("host key dir path is not utf-8"))?;
let mut server_process = ServerProcess::new( let mut server_process = ServerProcess::new(
Command::new(&binary_path) Command::new(&binary_path)
.env(ENV_CONSOLE_ENABLE, "false")
.env(ENV_SFTP_ENABLE, "true") .env(ENV_SFTP_ENABLE, "true")
.env(ENV_SFTP_ADDRESS, SFTP_ADDRESS) .env(ENV_SFTP_ADDRESS, SFTP_ADDRESS)
.env(ENV_SFTP_HOST_KEY_DIR, host_key_dir_str) .env(ENV_SFTP_HOST_KEY_DIR, host_key_dir_str)
@@ -504,6 +505,7 @@ pub async fn test_sftp_idle_timeout_disconnects() -> Result<()> {
.ok_or_else(|| anyhow!("host key dir path is not utf-8"))?; .ok_or_else(|| anyhow!("host key dir path is not utf-8"))?;
let mut server_process = ServerProcess::new( let mut server_process = ServerProcess::new(
Command::new(&binary_path) Command::new(&binary_path)
.env(ENV_CONSOLE_ENABLE, "false")
.env(ENV_SFTP_ENABLE, "true") .env(ENV_SFTP_ENABLE, "true")
.env(ENV_SFTP_ADDRESS, IDLE_SFTP_ADDRESS) .env(ENV_SFTP_ADDRESS, IDLE_SFTP_ADDRESS)
.env(ENV_SFTP_HOST_KEY_DIR, host_key_dir_str) .env(ENV_SFTP_HOST_KEY_DIR, host_key_dir_str)
@@ -151,6 +151,7 @@ pub async fn test_webdav_core_operations() -> Result<()> {
let mut server_process = Command::new(&binary_path) let mut server_process = Command::new(&binary_path)
.arg("--address") .arg("--address")
.arg(S3_TEST_ADDRESS) .arg(S3_TEST_ADDRESS)
.env("RUSTFS_CONSOLE_ENABLE", "false")
.env("RUSTFS_WEBDAV_ENABLE", "true") .env("RUSTFS_WEBDAV_ENABLE", "true")
.env("RUSTFS_WEBDAV_ADDRESS", WEBDAV_ADDRESS) .env("RUSTFS_WEBDAV_ADDRESS", WEBDAV_ADDRESS)
.env("RUSTFS_WEBDAV_TLS_ENABLED", "false") // No TLS for testing .env("RUSTFS_WEBDAV_TLS_ENABLED", "false") // No TLS for testing