Skip to content

Commit d8d3048

Browse files
committed
Simplify port allocation for sequential test execution
1 parent bb7c925 commit d8d3048

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

integration-tests/tests/common.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,20 @@ pub struct AgentProcess {
7777
}
7878

7979
impl AgentProcess {
80-
pub async fn start_on_port(port: u16) -> AgentProcess {
80+
pub async fn start() -> AgentProcess {
81+
Self::start_with_config(2775, 5).await
82+
}
83+
84+
pub async fn start_with_config(port: u16, ttl_seconds: u16) -> AgentProcess {
8185
let config_content = format!(
8286
r#"
8387
http_port = {}
8488
log_level = "info"
85-
ttl_seconds = 5
89+
ttl_seconds = {}
8690
cache_size = 100
8791
validate_credentials = true
8892
"#,
89-
port
93+
port, ttl_seconds
9094
);
9195

9296
let config_path = format!("/tmp/test_config_{}.toml", port);

integration-tests/tests/secret_retrieval.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ async fn test_secret_retrieval_by_name() {
88
let secrets = TestSecrets::setup().await;
99
let secret_name = secrets.secret_name(SecretType::Basic);
1010

11-
let agent = AgentProcess::start_on_port(2775).await;
11+
let agent = AgentProcess::start().await;
1212

1313
let query = AgentQueryBuilder::default()
1414
.secret_id(&secret_name)
@@ -41,7 +41,7 @@ async fn test_secret_retrieval_by_arn() {
4141

4242
let arn = describe_response.arn().expect("Secret ARN not found");
4343

44-
let agent = AgentProcess::start_on_port(2776).await;
44+
let agent = AgentProcess::start().await;
4545

4646
let query = AgentQueryBuilder::default().secret_id(arn).build().unwrap();
4747
let response = agent.make_request(&query).await;
@@ -57,7 +57,7 @@ async fn test_binary_secret_retrieval() {
5757
let secrets = TestSecrets::setup().await;
5858
let secret_name = secrets.secret_name(SecretType::Binary);
5959

60-
let agent = AgentProcess::start_on_port(2777).await;
60+
let agent = AgentProcess::start().await;
6161

6262
let query = AgentQueryBuilder::default()
6363
.secret_id(&secret_name)
@@ -82,7 +82,7 @@ async fn test_version_stage_retrieval() {
8282
.wait_for_pending_version(SecretType::Versioned)
8383
.await;
8484

85-
let agent = AgentProcess::start_on_port(2778).await;
85+
let agent = AgentProcess::start().await;
8686

8787
// Test AWSCURRENT stage (latest version)
8888
let current_query = AgentQueryBuilder::default()
@@ -138,7 +138,7 @@ async fn test_version_id_retrieval() {
138138
let (current_version_id, pending_version_id) =
139139
secrets.get_version_ids(SecretType::Versioned).await;
140140

141-
let agent = AgentProcess::start_on_port(2779).await;
141+
let agent = AgentProcess::start().await;
142142

143143
// Test retrieval by AWSCURRENT version ID
144144
let current_query = AgentQueryBuilder::default()
@@ -179,7 +179,7 @@ async fn test_large_secret_retrieval() {
179179
let secrets = TestSecrets::setup().await;
180180
let secret_name = secrets.secret_name(SecretType::Large);
181181

182-
let agent = AgentProcess::start_on_port(2780).await;
182+
let agent = AgentProcess::start().await;
183183

184184
let query = AgentQueryBuilder::default()
185185
.secret_id(&secret_name)

0 commit comments

Comments
 (0)