Skip to content

Use the AWS documentation placeholder instance ids in fleet host fixtures #1336

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

Merged
ejc3 merged 1 commit into from
Oct 26, 2026
Merged

Use the AWS documentation placeholder instance ids in fleet host fixtures #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/fleet/coord/hosts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,15 +1293,15 @@ mod tests {
#[test]
fn describe_answers_parse_to_hosts_with_their_market() {
let xml = r#"<DescribeInstancesResponse><reservationSet><item><instancesSet>
<item><instanceId>i-0000000000000000a</instanceId><instanceState><code>16</code><name>running</name></instanceState>
<item><instanceId>i-0123456789abcdef0</instanceId><instanceState><code>16</code><name>running</name></instanceState>
<instanceLifecycle>spot</instanceLifecycle><tagSet><item><key>Purpose</key><value>fcvm-fleet-host</value></item></tagSet></item>
<item><instanceId>i-0000000000000000b</instanceId><instanceState><code>0</code><name>pending</name></instanceState></item>
<item><instanceId>i-1234567890abcdef0</instanceId><instanceState><code>0</code><name>pending</name></instanceState></item>
</instancesSet></item></reservationSet></DescribeInstancesResponse>"#;
assert_eq!(
parse_hosts(xml),
vec![
host("i-0000000000000000a", "running", Market::Spot),
host("i-0000000000000000b", "pending", Market::OnDemand),
host("i-0123456789abcdef0", "running", Market::Spot),
host("i-1234567890abcdef0", "pending", Market::OnDemand),
]
);
}
Expand All @@ -1312,14 +1312,14 @@ mod tests {
fn describe_answers_parse_by_item_whatever_the_field_order() {
let xml = r#"<DescribeInstancesResponse><reservationSet><item><instancesSet>
<item><instanceState><code>16</code><name>running</name></instanceState><instanceLifecycle>spot</instanceLifecycle>
<tagSet><item><key>Purpose</key><value>fcvm-fleet-host</value></item></tagSet><instanceId>i-0000000000000000a</instanceId></item>
<item><instanceId>i-0000000000000000b</instanceId><instanceState><code>0</code><name>pending</name></instanceState></item>
<tagSet><item><key>Purpose</key><value>fcvm-fleet-host</value></item></tagSet><instanceId>i-0123456789abcdef0</instanceId></item>
<item><instanceId>i-1234567890abcdef0</instanceId><instanceState><code>0</code><name>pending</name></instanceState></item>
</instancesSet></item></reservationSet></DescribeInstancesResponse>"#;
assert_eq!(
parse_hosts(xml),
vec![
host("i-0000000000000000a", "running", Market::Spot),
host("i-0000000000000000b", "pending", Market::OnDemand),
host("i-0123456789abcdef0", "running", Market::Spot),
host("i-1234567890abcdef0", "pending", Market::OnDemand),
]
);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/test_fleet_coord.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3424,7 +3424,7 @@ async fn fake_ec2_api(api: FakeEc2Api) -> String {
if spot && !api.spot_capacity.contains(&region) {
return (StatusCode::OK, "<CreateFleetResponse><fleetId>fleet-0</fleetId><errorSet><item><lifecycle>spot</lifecycle><errorCode>UnfulfillableCapacity</errorCode><errorMessage>Unable to fulfill capacity due to your request configuration.</errorMessage></item></errorSet><fleetInstanceSet/></CreateFleetResponse>".into());
}
(StatusCode::OK, "<CreateFleetResponse><fleetId>fleet-1</fleetId><fleetInstanceSet><item><instanceIds><item>i-0fedcba9876543210</item></instanceIds></item></fleetInstanceSet></CreateFleetResponse>".into())
(StatusCode::OK, "<CreateFleetResponse><fleetId>fleet-1</fleetId><fleetInstanceSet><item><instanceIds><item>i-1234567890abcdef0</item></instanceIds></item></fleetInstanceSet></CreateFleetResponse>".into())
}
_ => error("InvalidAction"),
}
Expand Down Expand Up @@ -3475,7 +3475,7 @@ async fn the_aws_host_driver_launches_through_an_instant_fleet() {
.launch("us-east-1", Market::OnDemand, 1, "token-od")
.await
.unwrap();
assert_eq!(od.ids, vec!["i-0fedcba9876543210".to_string()]);
assert_eq!(od.ids, vec!["i-1234567890abcdef0".to_string()]);
let calls = api.calls.lock().unwrap().clone();
// The template's type is read once and reused for the second launch.
let reads: Vec<_> = calls
Expand Down
Loading