From 853be85bb155828c747b8067e640ed52567a9359 Mon Sep 17 00:00:00 2001
From: Gemma <58080601+gememma@users.noreply.github.com>
Date: Thu, 9 May 2024 11:56:53 +0100
Subject: [PATCH] Change flaky test to using with_env_vars (#2434)

---
 changelog.d/2163.internal.md     |  1 +
 mirrord/config/src/feature/fs.rs | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/2163.internal.md

diff --git a/changelog.d/2163.internal.md b/changelog.d/2163.internal.md
new file mode 100644
index 00000000000..bca33ba0cc5
--- /dev/null
+++ b/changelog.d/2163.internal.md
@@ -0,0 +1 @@
+Use `with_env_vars` in flaky `fs_config_default` test
\ No newline at end of file
diff --git a/mirrord/config/src/feature/fs.rs b/mirrord/config/src/feature/fs.rs
index 5357829628e..146608a9003 100644
--- a/mirrord/config/src/feature/fs.rs
+++ b/mirrord/config/src/feature/fs.rs
@@ -126,20 +126,23 @@ mod tests {
     use rstest::rstest;
 
     use super::*;
-    use crate::config::MirrordConfig;
+    use crate::{config::MirrordConfig, util::testing::with_env_vars};
 
     #[rstest]
     fn fs_config_default() {
-        let mut cfg_context = ConfigContext::default();
         let expect = FsConfig {
             mode: FsModeConfig::Read,
             ..Default::default()
         };
 
-        let fs_config = FsUserConfig::default()
-            .generate_config(&mut cfg_context)
-            .unwrap();
+        with_env_vars(vec![], || {
+            let mut cfg_context = ConfigContext::default();
 
-        assert_eq!(fs_config, expect);
+            let fs_config = FsUserConfig::default()
+                .generate_config(&mut cfg_context)
+                .unwrap();
+
+            assert_eq!(fs_config, expect);
+        });
     }
 }