Fix tests in CI

RooseveltBeauf1 · Apr 13, 2023 · 9cc39ce · 9cc39ce
1 parent 07b9034
commit 9cc39ce
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/tests/integration.suite.ts b/tests/integration.suite.ts
@@ -16,6 +16,7 @@ type RunOptions = ({
 }) & {
   env?: Record<string, string>
   throws?: boolean
+  sync?: boolean
 }
 
 interface Enhancements {
@@ -63,7 +64,8 @@ const suite = describe({
     const teafile = bin.join('tea')
     const { sandbox } = this
 
-    this.run = ({env, throws, ...opts}: RunOptions) => {
+    this.run = ({env, throws, sync, ...opts}: RunOptions) => {
+      sync ??= true
       env ??= {}
       for (const key of ['HOME', 'CI', 'RUNNER_DEBUG', 'GITHUB_ACTIONS']) {
         const value = Deno.env.get(key)
@@ -83,19 +85,23 @@ const suite = describe({
           ? [...opts.args]
           : [...opts.cmd]
 
-        // be faster when testing locally
+
+        //TODO we typically don’t want silent, we just want ERRORS-ONLY
         if ("args" in opts) {
-          if (!existing_tea_prefix) {
+          if (!existing_tea_prefix && sync) {
             cmd.unshift("--sync")
           }
           cmd.unshift(teafile.string)
         } else if (cmd[0] != 'tea') {
           // we need to do an initial --sync
-          const proc = Deno.run({ cmd: [teafile.string, '-Ss'], cwd: sandbox.string, env, clearEnv: true })
+          const arg = sync ? "-Ss" : "-s"
+          const proc = Deno.run({ cmd: [teafile.string, arg], cwd: sandbox.string, env, clearEnv: true })
           assertEquals((await proc.status()).code, 0)
           proc.close()
         }
 
+        console.log(cmd, env)
+
         const proc = Deno.run({ cmd, cwd: sandbox.string, stdout, stderr, env, clearEnv: true})
         try {
           const status = await proc.status()

diff --git a/tests/integration/package.yml.test.ts b/tests/integration/package.yml.test.ts
@@ -18,12 +18,15 @@ it(suite, "runtime.env tildes", async function() {
       echo "$FOO"
       `, force: true}).chmod(0o755)
 
+      console.log(this.sandbox, this.sandbox.isDirectory())
+
     const out = await this.run({
       args: ["foo"],
       env: {
         TEA_PANTRY_PATH: this.sandbox.string,
         TEA_PREFIX: this.sandbox.string
-      }
+      },
+      sync: false
     }).stdout()
 
     assertEquals(out.trim(), FOO.replaceAll("{{home}}", Path.home().string))