Skip to content

tests: Fix rate limit test flakiness by using database reset instead of sleep #11484

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
merged 1 commit into from
Jul 1, 2025
Merged

tests: Fix rate limit test flakiness by using database reset instead of sleep #11484

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: 12 additions & 4 deletions src/tests/krate/publish/rate_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use chrono::{DateTime, Utc};
use diesel::ExpressionMethods;
use diesel_async::RunQueryDsl;
use insta::assert_snapshot;
use std::thread;
use std::time::Duration;

#[tokio::test(flavor = "multi_thread")]
Expand Down Expand Up @@ -238,7 +237,7 @@ async fn publish_new_crate_rate_limit_doesnt_affect_existing_crates() {

#[tokio::test(flavor = "multi_thread")]
async fn publish_existing_crate_rate_limited() {
const RATE_LIMIT: Duration = Duration::from_millis(1000);
const RATE_LIMIT: Duration = Duration::from_secs(60);

let (app, anon, _, token) = TestApp::full()
.with_rate_limit(LimitedAction::PublishUpdate, RATE_LIMIT, 1)
Expand Down Expand Up @@ -293,8 +292,17 @@ async fn publish_existing_crate_rate_limited() {
rss/updates.xml
");

// Wait for the limit to be up
thread::sleep(RATE_LIMIT);
// Reset the rate limit by updating the database timestamp
let mut conn = app.db_conn().await;
let past_time = Utc::now().naive_utc() - RATE_LIMIT - Duration::from_secs(10);

diesel::update(publish_limit_buckets::table)
.filter(publish_limit_buckets::user_id.eq(token.as_model().user_id))
.filter(publish_limit_buckets::action.eq(LimitedAction::PublishUpdate))
.set(publish_limit_buckets::last_refill.eq(past_time))
.execute(&mut conn)
.await
.expect("Failed to reset rate limit");

let crate_to_publish = PublishBuilder::new("rate_limited1", "1.0.2");
token.publish_crate(crate_to_publish).await.good();
Expand Down