Await async mutex for test isolation

captbaritone · facebook-github-bot · commit 75feb4abf384 · 2023-10-10T14:52:27.000-07:00
Differential Revision: D50141752
diff --git a/compiler/crates/fixture-tests/src/lib.rs b/compiler/crates/fixture-tests/src/lib.rs
@@ -107,9 +107,10 @@ pub async fn test_fixture<T, U, V>(
     let expect_ok = !input.contains("expected-to-throw");
     let actual_result: Result<U, V>;
     {
-        let _guard = LOCK.lock();
-        env::set_var("NO_COLOR", "1");
+        let _guard = LOCK.lock().await;
+        colored::control::set_override(false);
         actual_result = transform(&fixture).await;
+        colored::control::unset_override();
     }
 
     let actual = match &actual_result {

Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,10 @@ pub async fn test_fixture<T, U, V>(`
`107`	`107`	`let expect_ok = !input.contains("expected-to-throw");`
`108`	`108`	`let actual_result: Result<U, V>;`
`109`	`109`	`{`
`110`		`- let _guard = LOCK.lock();`
`111`		`- env::set_var("NO_COLOR", "1");`
	`110`	`+ let _guard = LOCK.lock().await;`
	`111`	`+ colored::control::set_override(false);`
`112`	`112`	`actual_result = transform(&fixture).await;`
	`113`	`+ colored::control::unset_override();`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`let actual = match &actual_result {`