Skip to content

Commit 683b129

Browse files
ryoppippirzv-me
andcommitted
test(codex): assert duplicate copies land in exactly one tier bucket
Co-authored-by: Razvan Aurariu <[email protected]>
1 parent 7d2867a commit 683b129

1 file changed

Lines changed: 26 additions & 6 deletions

File tree

‎rust/adapters/codex/src/compaction_tests.rs‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ fn direct_reports_merge_recorded_tiers_of_duplicate_compactions() {
245245
(Some(Fast), Ultrafast, Ultrafast),
246246
(Some(Ultrafast), Flex, Ultrafast),
247247
(Some(Ultrafast), Standard, Standard),
248+
(Some(Standard), Ultrafast, Standard),
248249
] {
249250
let first = CodexTokenUsageEvent {
250251
service_tier: first_tier,
@@ -259,13 +260,32 @@ fn direct_reports_merge_recorded_tiers_of_duplicate_compactions() {
259260
aggregate_events(&[first, duplicate], AgentReportKind::Session, Some("UTC")).unwrap();
260261
assert_eq!(groups.len(), 1);
261262
let usage = &groups["first"].models["gpt-5"];
262-
let recorded = match merged_tier {
263-
Standard => usage.recorded_standard_usage,
264-
Fast => usage.recorded_fast_usage,
265-
Flex => usage.recorded_flex_usage,
266-
Ultrafast => usage.recorded_ultrafast_usage,
263+
let recorded = [
264+
(Standard, usage.recorded_standard_usage),
265+
(Fast, usage.recorded_fast_usage),
266+
(Flex, usage.recorded_flex_usage),
267+
(Ultrafast, usage.recorded_ultrafast_usage),
268+
];
269+
let input_tokens = |tier| {
270+
recorded
271+
.iter()
272+
.filter(|(recorded_tier, _)| *recorded_tier == tier)
273+
.map(|(_, bucket)| bucket.input_tokens)
274+
.sum::<u64>()
267275
};
268-
assert_eq!(recorded.input_tokens, 300, "{first_tier:?} + {copy_tier:?}");
276+
assert_eq!(
277+
input_tokens(merged_tier),
278+
300,
279+
"{first_tier:?} + {copy_tier:?}"
280+
);
281+
assert_eq!(
282+
recorded
283+
.iter()
284+
.map(|(_, bucket)| bucket.input_tokens)
285+
.sum::<u64>(),
286+
300,
287+
"{first_tier:?} + {copy_tier:?}"
288+
);
269289
assert_eq!(usage.input_tokens, 300);
270290
}
271291
}

0 commit comments

Comments
 (0)