start-command 0.35.3 → 0.36.0

package/test/execution-resume.js

@@ -270,11 +270,14 @@ describe('resumeExecution', () => {
         watchers.push([name, policy, logPath]),
     });
     assert.strictEqual(result.success, true, result.error);
-    assert.deepStrictEqual(calls, [['docker', 'start', 'box']]);
+    assert.deepStrictEqual(
+      calls.filter((call) => call[1] !== 'inspect'),
+      [['docker', 'start', 'box']]
+    );
     assert.strictEqual(watchers.length, 1);
     assert.strictEqual(watchers[0][0], 'box');
     assert.strictEqual(watchers[0][2], '/tmp/session.log');
-    assert.strictEqual(store.saved.length, 1);
+    assert.strictEqual(store.saved.length, 3);
     assert.strictEqual(store.saved[0].uuid, record.uuid);
     assert.strictEqual(store.saved[0].status, 'executing');
     assert.strictEqual(store.saved[0].options.resumeCount, 1);
@@ -320,7 +323,10 @@ describe('resumeExecution', () => {
     });
     assert.strictEqual(result.success, false);
     assert.match(result.error, /no such container/);
-    assert.strictEqual(store.saved.length, 0);
+    assert.strictEqual(store.saved.length, 2);
+    assert.strictEqual(store.saved.at(-1).status, 'executing');
+    assert.strictEqual(store.saved.at(-1).options.sessionName, 'box');
+    assert.strictEqual(store.saved.at(-1).options.launchPending, undefined);
   });
 
   test('relaunches through the isolation backend when the container is gone', async () => {
@@ -329,6 +335,7 @@ describe('resumeExecution', () => {
     const launches = [];
     const result = await resumeExecution(store, 'box', {
       probe: () => probeWith(SessionState.MISSING),
+      startWatcher: () => {},
       runIsolated: (backend, command, options) => {
         launches.push({ backend, command, options });
         return Promise.resolve({ success: true, containerId: 'newid' });

package/test/exit-reason.js

@@ -111,7 +111,11 @@ describe('resolveExitReason', () => {
   });
 
   it('should report the cgroup OOM observation when there is no marker', () => {
-    const reason = resolveExitReason({ exitCode: 137, oomKilled: true });
+    const reason = resolveExitReason({
+      exitCode: 137,
+      oomKilled: true,
+      exitEvidence: { mainOom: true },
+    });
     assert.strictEqual(reason, 'memory-exhaustion (cgroup-oom-killer)');
   });
 
@@ -173,6 +177,7 @@ describe('resolveMemoryExhaustion', () => {
       resolveMemoryExhaustion({
         exitCode: 137,
         logTail: 'killed\n',
+        exitEvidence: { mainOom: true },
         oomKilled: true,
       }),
       {

package/test/isolation.js

@@ -16,6 +16,7 @@ const {
   supportsLogfileOption,
   resetScreenVersionCache,
   getDefaultDockerImage,
+  canRunLinuxDockerImages,
 } = require('../src/lib/isolation');
 
 describe('Isolation Module', () => {
@@ -665,8 +666,8 @@ describe('detectShellInEnvironment', () => {
   });
 
   it('should auto-detect shell in docker if docker is available', () => {
-    if (!isCommandAvailable('docker')) {
-      console.log('  Skipping: docker not installed');
+    if (!canRunLinuxDockerImages()) {
+      console.log('  Skipping: Docker cannot run Linux container images');
       return;
     }
     // Use alpine:latest which is commonly available and has sh
@@ -703,8 +704,8 @@ describe('Shell option forwarding to isolation runners', () => {
 
   describe('runInDocker shell option', () => {
     it('should accept shell option in options object', async () => {
-      if (!isCommandAvailable('docker')) {
-        console.log('  Skipping: docker not installed');
+      if (!canRunLinuxDockerImages()) {
+        console.log('  Skipping: Docker cannot run Linux container images');
         return;
       }
 

package/test/regression-174.js

@@ -100,9 +100,11 @@ function runWatcher({ policy, running, state, withLog = true }) {
     [
       '#!/bin/sh',
       `dir='${dir}'`,
+      '[ "$START_COMMAND_CGROUP_SAMPLING" = 1 ] && exit 1',
       'case "$1" in',
       '  inspect)',
       '    case "$3" in',
+      '      *HostConfig*) exit 1 ;;',
       '      *State.Running*)',
       '        answer=$(head -n 1 "$dir/running")',
       '        if [ "$(wc -l < "$dir/running")" -gt 1 ]; then',
@@ -173,7 +175,7 @@ describe('issue #174: docker logs -f returning is not the container exiting', ()
     });
 
     expect(run.status).toBe(0);
-    expect(run.calls).toContain('wait');
+    expect(run.calls).toContain('inspect-running false');
     expect(run.calls.indexOf('wait')).toBeGreaterThan(
       run.calls.indexOf('logs')
     );

package/test/regression-176.js

@@ -313,7 +313,11 @@ describe('issue #176: snapshot resume keeps the resource limits', () => {
     expect(saved[0].options.sessionName).toBe('box-resume-1');
     expect(result.output).toContain('--pids-limit=64');
     // A snapshot container has no recovery selector.
-    expect(watchers[0][4]).toEqual({ recoverOnKill: false });
+    expect(watchers[0][4]).toEqual({
+      recoverOnKill: false,
+      since: saved[0].attempt.startedAt,
+      attemptNumber: saved[0].attempt.number,
+    });
   });
 
   it('shows the limits in [Isolation] lines and stores them as metadata', () => {

package/test/regression-180.js

@@ -70,20 +70,20 @@ describe('issue #180: the sticky OOMKilled flag is not an exit reason', () => {
     {
       exitCode: 137,
       oomKilled: true,
-      reason: CGROUP_OOM_EXIT_REASON,
-      memory: true,
+      reason: 'signal (SIGKILL; cause unknown)',
+      memory: false,
     },
     {
       exitCode: 137,
       oomKilled: false,
-      reason: 'signal (SIGKILL)',
+      reason: 'signal (SIGKILL; cause unknown)',
       memory: false,
     },
     {
       exitCode: -1,
       oomKilled: true,
-      reason: CGROUP_OOM_EXIT_REASON,
-      memory: true,
+      reason: null,
+      memory: false,
     },
     {
       exitCode: 139,
@@ -104,10 +104,17 @@ describe('issue #180: the sticky OOMKilled flag is not an exit reason', () => {
     });
   }
 
-  it('blames the flag on the command only for SIGKILL or an unknown exit', () => {
-    expect(isOomKillOfCommand({ exitCode: 137, oomKilled: true })).toBe(true);
-    expect(isOomKillOfCommand({ exitCode: null, oomKilled: true })).toBe(true);
-    expect(isOomKillOfCommand({ exitCode: -1, oomKilled: true })).toBe(true);
+  it('requires fresh attribution in addition to SIGKILL or an unknown exit', () => {
+    expect(isOomKillOfCommand({ exitCode: 137, oomKilled: true })).toBe(false);
+    expect(
+      isOomKillOfCommand({
+        exitCode: 137,
+        oomKilled: true,
+        exitEvidence: { mainOom: true },
+      })
+    ).toBe(true);
+    expect(isOomKillOfCommand({ exitCode: null, oomKilled: true })).toBe(false);
+    expect(isOomKillOfCommand({ exitCode: -1, oomKilled: true })).toBe(false);
     expect(isOomKillOfCommand({ exitCode: 0, oomKilled: true })).toBe(false);
     expect(isOomKillOfCommand({ exitCode: 1, oomKilled: true })).toBe(false);
     expect(isOomKillOfCommand({ exitCode: 137, oomKilled: false })).toBe(false);
@@ -191,6 +198,6 @@ describe('issue #180: the sticky OOMKilled flag is not an exit reason', () => {
       oomKilled: true,
       logPath: null,
     });
-    expect(main).toContain('Docker reports it was OOM-killed.');
+    expect(main).toContain('Docker reports a process in it was OOM-killed.');
   });
 });

package/test/regression-182.js

@@ -285,9 +285,13 @@ describe('issue #182: the watcher samples the cgroup while the container runs',
       timeout: 20000,
     });
     expect(result.status).toBe(0);
-    expect(fs.readFileSync(path.join(host.dir, 'sample'), 'utf8')).toBe(
-      OOM_SAMPLE
-    );
+    expect(
+      fs
+        .readFileSync(path.join(host.dir, 'sample'), 'utf8')
+        .split(' ')
+        .slice(0, 4)
+        .join(' ')
+    ).toBe(OOM_SAMPLE);
     expect(fs.readFileSync(logPath, 'utf8')).toBe(
       `${formatCgroupMemoryLogLine(OOM_SAMPLE)}\n`
     );

package/test/regression-185.js

@@ -97,15 +97,10 @@ describe('issue #185: counter-only OOM scope is unknown', () => {
     }
     for (const exitCode of [137, null, -1]) {
       const input = { exitCode, oomKilled: false, cgroupMemory };
-      expect(resolveExitReason(input)).toBe(CGROUP_OOM_EXIT_REASON);
-      expect(resolveMemoryExhaustion(input)).toEqual(
-        exitCode === null
-          ? null
-          : {
-              memoryExhausted: true,
-              memoryExhaustedReason: 'cgroup memory.events reported oom_kill=3',
-            }
-      );
+      expect(resolveExitReason(input)).not.toBe(CGROUP_OOM_EXIT_REASON);
+      expect(resolveMemoryExhaustion(input)).toBeNull();
+      const attributed = { ...input, exitEvidence: { mainOom: true } };
+      expect(resolveExitReason(attributed)).toBe(CGROUP_OOM_EXIT_REASON);
     }
   });
 });