cleanup tests

Author: crowlKats

sandbox.test.ts

@@ -1,5 +1,5 @@
 import { $ } from "dax";
-import { assertEquals, assertExists } from "@std/assert";
+import { assert, assertEquals } from "@std/assert";
 
 if (!Deno.env.get("DENO_DEPLOY_TOKEN")) {
   console.error("DENO_DEPLOY_TOKEN environment variable is required.");
@@ -8,7 +8,7 @@ if (!Deno.env.get("DENO_DEPLOY_TOKEN")) {
 
 const sandbox = async (...args: string[]) => {
   console.log(`deno sandbox ${args.join(" ")}`);
-  return await $.raw`deno sandbox ${args.join(" ")}`.text();
+  return (await $.raw`deno sandbox ${args.join(" ")}`.text()).trim();
 };
 
 Deno.test("sandbox create", async () => {
@@ -20,36 +20,33 @@ Deno.test("sandbox create", async () => {
     "echo",
     "test",
   );
-  await sandbox("kill", sandboxId.trim());
+  await sandbox("kill", sandboxId);
 });
 
 Deno.test("sandbox exec", async () => {
   const sandboxId = await sandbox("create", "--quiet", "--lifetime", "60s");
-  const cleanId = sandboxId.trim();
-  console.log(cleanId);
 
-  const res = await sandbox("exec", cleanId, "echo", "'exec test'");
-  assertEquals(res.trim(), "exec test");
+  const res = await sandbox("exec", sandboxId, "echo", "'exec test'");
+  assertEquals(res, "exec test");
 
-  await sandbox("kill", cleanId);
+  await sandbox("kill", sandboxId);
 });
 
 Deno.test("sandbox copy", async () => {
   const sandboxId = await sandbox("create", "--quiet", "--lifetime", "60s");
-  const cleanId = sandboxId.trim();
 
   await Deno.writeTextFile("test.txt", "test content");
 
-  await sandbox("copy", "test.txt", `${cleanId}:/tmp/test.txt`);
+  await sandbox("copy", "test.txt", `${sandboxId}:/tmp/test.txt`);
 
-  await sandbox("copy", `${cleanId}:/tmp/test.txt`, "./downloaded.txt");
+  await sandbox("copy", `${sandboxId}:/tmp/test.txt`, "./downloaded.txt");
   const downloadedContent = await Deno.readTextFile("./downloaded.txt");
   assertEquals(downloadedContent, "test content");
 
   await Deno.remove("test.txt");
   await Deno.remove("downloaded.txt");
 
-  await sandbox("kill", cleanId);
+  await sandbox("kill", sandboxId);
 });
 
 Deno.test("sandbox extend", async () => {
@@ -61,50 +58,47 @@ Deno.test("sandbox extend", async () => {
     "sleep",
     "10",
   );
-  const cleanId = sandboxId.trim();
 
-  await sandbox("extend", cleanId, "120s");
+  await sandbox("extend", sandboxId, "120s");
 
-  await sandbox("kill", cleanId);
+  await sandbox("kill", sandboxId);
 });
 
 Deno.test("sandbox exec with complex commands", async () => {
   const sandboxId = await sandbox("create", "--quiet", "--lifetime", "60s");
-  const cleanId = sandboxId.trim();
 
-  const result = await sandbox("exec", cleanId, "'echo hello && echo world'");
-  assertEquals(result.includes("hello"), true);
-  assertEquals(result.includes("world"), true);
+  const result = await sandbox("exec", sandboxId, "'echo hello && echo world'");
+  assert(result.includes("hello"));
+  assert(result.includes("world"));
 
-  await sandbox("kill", cleanId);
+  await sandbox("kill", sandboxId);
 });
 
 Deno.test("sandbox copy directory structure", async () => {
   const sandboxId = await sandbox("create", "--quiet", "--lifetime", "60s");
-  const cleanId = sandboxId.trim();
 
   await Deno.mkdir("testdir", { recursive: true });
   await Deno.writeTextFile("testdir/file1.txt", "content1");
   await Deno.writeTextFile("testdir/file2.txt", "content2");
 
-  await sandbox("exec", cleanId, "'mkdir -p /tmp/testdir'");
+  await sandbox("exec", sandboxId, "'mkdir -p /tmp/testdir'");
   await sandbox(
     "copy",
     "testdir/file1.txt",
-    `${cleanId}:/tmp/testdir/file1.txt`,
+    `${sandboxId}:/tmp/testdir/file1.txt`,
   );
   await sandbox(
     "copy",
     "testdir/file2.txt",
-    `${cleanId}:/tmp/testdir/file2.txt`,
+    `${sandboxId}:/tmp/testdir/file2.txt`,
   );
 
-  const result = await sandbox("exec", cleanId, "ls", "/tmp/testdir");
-  assertEquals(result.includes("file1.txt"), true);
-  assertEquals(result.includes("file2.txt"), true);
+  const result = await sandbox("exec", sandboxId, "ls", "/tmp/testdir");
+  assert(result.includes("file1.txt"));
+  assert(result.includes("file2.txt"));
 
   await Deno.remove("testdir", { recursive: true });
-  await sandbox("kill", cleanId);
+  await sandbox("kill", sandboxId);
 });
 
 Deno.test("volumes create", async () => {
@@ -119,9 +113,8 @@ Deno.test("volumes create", async () => {
     "--region",
     "ord",
   );
-  assertExists(volumeId.trim());
 
-  await sandbox("volumes", "delete", volumeId.trim());
+  await sandbox("volumes", "delete", volumeId);
 });
 
 Deno.test("sandbox with volume mount", async () => {
@@ -136,31 +129,29 @@ Deno.test("sandbox with volume mount", async () => {
     "--region",
     "ord",
   );
-  const cleanVolumeId = volumeId.trim();
 
   const sandboxId = await sandbox(
     "create",
     "--quiet",
     "--lifetime",
     "60s",
     "--volume",
-    `${cleanVolumeId}:/data/dataset`,
+    `${volumeId}:/data/dataset`,
   );
-  const cleanId = sandboxId.trim();
 
   await sandbox(
     "exec",
-    cleanId,
+    sandboxId,
     "\"echo 'volume test' > /data/dataset/test.txt\"",
   );
   const result = await sandbox(
     "exec",
-    cleanId,
+    sandboxId,
     "cat",
     "/data/dataset/test.txt",
   );
-  assertEquals(result.trim(), "volume test");
+  assertEquals(result, "volume test");
 
-  await sandbox("kill", cleanId);
-  await sandbox("volumes", "delete", cleanVolumeId);
+  await sandbox("kill", sandboxId);
+  await sandbox("volumes", "delete", volumeId);
 });