Fixed failing tests due to concurrent cache access, instable package registry access and missing shell env.

Author: Charan Sarin

.gitignore

@@ -4,3 +4,4 @@
 /coverage
 /.eslintcache
 /.dccache
+/test/_yarn_cache

.taprc

@@ -1,4 +1,4 @@
 {
   "timeout": 30,
   "reporter": "spec"
-}
+}

bin/cli-install.js

@@ -57,7 +57,16 @@ const ensureGitClone = async (remote, local) => {
  */
 const yarnInstall = (local) => {
   const dir = absoluteRepoPath(local)
-  return run('yarn', ['install'], dir)
+  /* c8 ignore start */
+  const args = process.env.TAP
+    ? [
+        'install',
+        '--offline',
+        `--cache-folder ../../../../_yarn_cache/.yarn_${process.env.TAP_CHILD_ID}`
+      ]
+    : ['install']
+  /* c8 ignore stop */
+  return run('yarn', args, dir)
 }
 
 /**

src/utils.js

@@ -83,7 +83,9 @@ export const gitStatus = (dir) => {
   const firstLine = lines[0]
 
   const br = firstLine.match(/##\s+(\w+)/)
-  const branch = (br && String(br[1])) || ''
+
+  const branch =
+    (br && String(br[1])) || /* c8 ignore start */ '' /* c8 ignore stop */
 
   const b = firstLine.match(/behind\s+(\d+)/)
   const behind = (b && Number(b[1])) || 0

test/_fixtures/addrepos/.yarnrc

@@ -0,0 +1,2 @@
+yarn-offline-mirror "../../npm-packages-offline-cache"
+yarn-offline-mirror-pruning true

test/_fixtures/empty/.yarnrc

@@ -0,0 +1,2 @@
+yarn-offline-mirror "../../npm-packages-offline-cache"
+yarn-offline-mirror-pruning true

test/_fixtures/listrepos/.yarnrc

@@ -0,0 +1,2 @@
+yarn-offline-mirror "../../npm-packages-offline-cache"
+yarn-offline-mirror-pruning true

test/_fixtures/norepos/.yarnrc

@@ -0,0 +1,2 @@
+yarn-offline-mirror "../../npm-packages-offline-cache"
+yarn-offline-mirror-pruning true

test/_fixtures/pullrepos/.yarnrc

@@ -0,0 +1,2 @@
+yarn-offline-mirror "../../npm-packages-offline-cache"
+yarn-offline-mirror-pruning true

test/_fixtures/runrepos/.yarnrc

@@ -0,0 +1,2 @@
+yarn-offline-mirror "../../npm-packages-offline-cache"
+yarn-offline-mirror-pruning true

test/cli-install.test.js

@@ -1,9 +1,10 @@
 import path from 'path'
 import fs from 'fs-extra'
 import tap from 'tap'
-import { cli, stubGit, cleanupGit } from './helper.js'
+import { cli, stubGit, cleanupGit, before } from './helper.js'
+
+tap.before(before)
 
-// TODO fix on ci
 tap.test('$ cli install (on empty directory)', async (t) => {
   stubGit()
   const cwd = './test/_fixtures/addrepos'

test/cli-list.test.js

@@ -1,11 +1,13 @@
 import tap from 'tap'
 import { promisify } from 'util'
 import { exec } from 'child_process'
-import { cli, stubGit, cleanupGit } from './helper.js'
+import { cli, stubGit, cleanupGit, before } from './helper.js'
 import { root } from '../src/utils.js'
 
 const execPromise = promisify(exec)
 
+tap.before(before)
+
 tap.test('$ cli list (on empty directory)', async (t) => {
   const result = await cli(['list'], './test/_fixtures/empty')
   t.equal(0, result.code, 'Should succeed')

test/cli-pull.test.js

@@ -1,12 +1,14 @@
 import tap from 'tap'
 import { promisify } from 'util'
 import { exec } from 'child_process'
-import { cli, stubGit, cleanupGit } from './helper.js'
+import { cli, stubGit, cleanupGit, before } from './helper.js'
 import { root } from '../src/utils.js'
 
 const execPromise = promisify(exec)
 const cwd = './test/_fixtures/pullrepos'
 
+tap.before(before)
+
 const prepare = async ({ addChanges = false }) => {
   if (!addChanges) {
     stubGit('pull')

test/cli-run.test.js

@@ -1,7 +1,9 @@
 import tap from 'tap'
-import { cli, stubGit, cleanupGit } from './helper.js'
+import { cli, stubGit, cleanupGit, before } from './helper.js'
 const cwd = './test/_fixtures/runrepos'
 
+tap.before(before)
+
 const prepare = async () => {
   stubGit('run')
   return cli(['install'], cwd)

test/cli.test.js

@@ -1,5 +1,7 @@
 import tap from 'tap'
-import { cli } from './helper.js'
+import { cli, before } from './helper.js'
+
+tap.before(before)
 
 tap.test('$ cli', async (t) => {
   const result = await cli([])

test/helper.js

@@ -50,3 +50,12 @@ export const cleanupGit = (testPhase = 'install') => {
 }
 
 export const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+
+/**
+ * Set fallback for `process.env.SHELL` as it may be undefined in CI container
+ * Reason: `yarn --cache-folder` does not work properly without.
+ * See /src/utils.js (run->spawn)
+ */
+export const before = () => {
+  process.env.SHELL = process.env.SHELL || 'sh'
+}