Ensure no tmpfs for tests if running in docker without exec

exercism · Aug 12, 2024 · c907f7b · c907f7b
1 parent d652f26
commit c907f7b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -50,6 +50,9 @@ RUN set -ex; \
 ENV COREPACK_ENABLE_NETWORK=0
 ENV COREPACK_ENABLE_STRICT=0
 
+# Mark this as a docker run so we don't try to execute things in /tmp
+ENV TMP_MAY_BE_NON_EXEC=1
+
 # Execute everything as the appuser
 USER appuser
 ENTRYPOINT [ "/opt/test-runner/bin/run.sh" ]
diff --git a/bin/run.sh b/bin/run.sh
@@ -323,7 +323,7 @@ if test -f "${OUTPUT}package.json"; then
   fi
 fi;
 
-bin_jest="$(corepack pnpm bin)/jest"
+bin_jest="$(cd "${COREPACK_ROOT_DIR}" && corepack pnpm bin)/jest"
 if [[ -f "${bin_jest}" ]]; then
   echo "✔️  jest executable found using ${bin_jest}"
 
@@ -352,7 +352,7 @@ echo "  ➤  Execution (tests: does the solution work?)               "
 echo "╚═════════════════════════════════════════════════════════════╝"
 echo ""
 
-jest_tests=$(corepack pnpm jest "${OUTPUT}*" --listTests --passWithNoTests) || false
+jest_tests=$(cd "${COREPACK_ROOT_DIR}" && corepack pnpm jest "${OUTPUT}*" --listTests --passWithNoTests) || false
 
 if [ -z "${jest_tests}" ]; then
   echo "❌  no jest tests (*.spec.js) discovered."

diff --git a/test/asserts.mjs b/test/asserts.mjs
@@ -7,7 +7,11 @@ import { run, root } from './paths.mjs'
 const SILENT = process.env.SILENT !== '0' && process.env.RUNNER_DEBUG !== '1'
 
 export function assertPass(slug, fixture, outputDir = null) {
-  outputDir = outputDir || mkdtempSync(join(tmpdir(), 'foo-'))
+  outputDir =
+    outputDir ||
+    (process.env.process.env.TMP_MAY_BE_NON_EXEC
+      ? fixture
+      : mkdtempSync(join(tmpdir(), 'assert-pass-')))
   const resultPath = join(outputDir, 'results.json')
 
   if (fixture[fixture.length - 1] !== sep) {
@@ -64,7 +68,11 @@ export function assertPass(slug, fixture, outputDir = null) {
 }
 
 export function rejectPass(slug, fixture, outputDir = null) {
-  outputDir = outputDir || mkdtempSync(join(tmpdir(), 'foo-'))
+  outputDir =
+    outputDir ||
+    (process.env.process.env.TMP_MAY_BE_NON_EXEC
+      ? fixture
+      : mkdtempSync(join(tmpdir(), 'reject-pass-')))
   const resultPath = join(outputDir, 'results.json')
 
   if (fixture[fixture.length - 1] !== sep) {
@@ -127,7 +135,11 @@ export function rejectPass(slug, fixture, outputDir = null) {
 }
 
 export function assertError(slug, fixture, outputDir = null) {
-  outputDir = outputDir || mkdtempSync(join(tmpdir(), 'foo-'))
+  outputDir =
+    outputDir ||
+    (process.env.process.env.TMP_MAY_BE_NON_EXEC
+      ? fixture
+      : mkdtempSync(join(tmpdir(), 'assert-error-')))
   const resultPath = join(outputDir, 'results.json')
 
   if (fixture[fixture.length - 1] !== sep) {

diff --git a/test/log.test.mjs b/test/log.test.mjs
@@ -7,7 +7,11 @@ import { fixtures, root, run } from './paths.mjs'
 const SILENT = process.env.SILENT !== '0' && process.env.RUNNER_DEBUG !== '1'
 
 export function assertLog(slug, fixture, outputDir = null) {
-  outputDir = outputDir || mkdtempSync(join(tmpdir(), 'foo-'))
+  outputDir =
+    outputDir ||
+    (process.env.process.env.TMP_MAY_BE_NON_EXEC
+      ? fixture
+      : mkdtempSync(join(tmpdir(), 'assert-log-')))
   const resultPath = join(outputDir, 'results.json')
 
   if (fixture[fixture.length - 1] !== sep) {

diff --git a/test/taskid.test.mjs b/test/taskid.test.mjs
@@ -9,10 +9,12 @@ shelljs.echo(
   'javascript-test-runner > passing solution with task ids > with output directory'
 )
 
-const outputDir = mkdtempSync(join(tmpdir(), 'foo-'))
-const resultPath = join(outputDir, 'results.json')
 const slug = 'lasagna'
-const fixture = join(fixtures, 'lasagna', 'exemplar')
+const fixture = join(fixtures, slug, 'exemplar')
+const outputDir = process.env.process.env.TMP_MAY_BE_NON_EXEC
+  ? fixture
+  : mkdtempSync(join(tmpdir(), 'assert-pass-'))
+const resultPath = join(outputDir, 'results.json')
 
 assertPass(slug, fixture, outputDir)