Skip to content

Commit 744d539

Browse files
committed
sentry - access - fix issue with not-cleaning Redis from previous test runs
1 parent 45c52ac commit 744d539

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

sentry/src/access.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,23 @@ mod test {
157157
use primitives::event_submission::{RateLimit, Rule};
158158
use primitives::sentry::Event;
159159
use primitives::util::tests::prep_db::DUMMY_CHANNEL;
160-
use primitives::{Channel, EventSubmission};
160+
use primitives::{Channel, EventSubmission, Config};
161161

162162
use crate::db::redis_connection;
163163
use crate::Session;
164164

165165
use super::*;
166166

167+
async fn setup() -> (Config, SharedConnection) {
168+
let mut redis = redis_connection().await.expect("Couldn't connect to Redis");
169+
let config = configuration("development", None).expect("Failed to get dev configuration");
170+
171+
// run `FLUSHALL` to clean any leftovers of other tests
172+
let _ = redis::cmd("FLUSHALL").query_async::<_, String>(&mut redis).await;
173+
174+
(config, redis)
175+
}
176+
167177
fn get_channel(with_rule: Rule) -> Channel {
168178
let mut channel = DUMMY_CHANNEL.clone();
169179

@@ -184,8 +194,7 @@ mod test {
184194

185195
#[tokio::test]
186196
async fn session_uid_rate_limit() {
187-
let redis = redis_connection().await.expect("Couldn't connect to Redis");
188-
let config = configuration("development", None).expect("Failed to get dev configuration");
197+
let (config, redis) = setup().await;
189198

190199
let session = Session {
191200
era: 0,
@@ -219,8 +228,7 @@ mod test {
219228

220229
#[tokio::test]
221230
async fn ip_rate_limit() {
222-
let redis = redis_connection().await.expect("Couldn't connect to Redis");
223-
let config = configuration("development", None).expect("Failed to get dev configuration");
231+
let (config, redis) = setup().await;
224232

225233
let session = Session {
226234
era: 0,

0 commit comments

Comments
 (0)