From b0c1bd82a85ddb54ffe717a2c158c33c0be99fe8 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Mon, 1 Apr 2024 18:58:52 -0400
Subject: fix: prevent cache db errors when deno_dir not exists (#23168)

Closes #20202
---
 tests/util/server/src/builders.rs | 7 +++++++
 tests/util/server/src/fs.rs       | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'tests/util/server/src')

diff --git a/tests/util/server/src/builders.rs b/tests/util/server/src/builders.rs
index e1d351da8..6a57548a3 100644
--- a/tests/util/server/src/builders.rs
+++ b/tests/util/server/src/builders.rs
@@ -782,6 +782,13 @@ impl TestCommandBuilder {
     for key in &self.envs_remove {
       envs.remove(key);
     }
+
+    // update any test variables in the env value
+    for value in envs.values_mut() {
+      *value =
+        value.replace("$DENO_DIR", &self.deno_dir.path().to_string_lossy());
+    }
+
     envs
   }
 }
diff --git a/tests/util/server/src/fs.rs b/tests/util/server/src/fs.rs
index 8955dc30e..b9ae81b49 100644
--- a/tests/util/server/src/fs.rs
+++ b/tests/util/server/src/fs.rs
@@ -159,8 +159,8 @@ impl PathRef {
     file.write_all(text.as_ref().as_bytes()).unwrap();
   }
 
-  pub fn write(&self, text: impl AsRef<str>) {
-    fs::write(self, text.as_ref()).unwrap();
+  pub fn write(&self, text: impl AsRef<[u8]>) {
+    fs::write(self, text).unwrap();
   }
 
   pub fn write_json<TValue: Serialize>(&self, value: &TValue) {
@@ -461,7 +461,7 @@ impl TempDir {
     self.target_path().join(from).rename(to)
   }
 
-  pub fn write(&self, path: impl AsRef<Path>, text: impl AsRef<str>) {
+  pub fn write(&self, path: impl AsRef<Path>, text: impl AsRef<[u8]>) {
     self.target_path().join(path).write(text)
   }
 
-- 
cgit v1.2.3