@bongos/core 1.24.84 → 1.24.86

package/tests/update_sweep_home.mjs

@@ -14,7 +14,7 @@ import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import { createRequire } from 'node:module';
 import { spawnSync } from 'node:child_process';
-import { mkdtempSync, mkdirSync, writeFileSync, readFileSync } from 'node:fs';
+import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, realpathSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -23,6 +23,12 @@ const require = createRequire(import.meta.url);
 const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const SWEEP = path.join(ROOT, 'scripts', 'bongos', 'update-sweep.js');
 const sweep = require(SWEEP);
+
+// A temp folder the code under test and this test can BOTH name the same way (task 1005096).
+// On a Mac os.tmpdir() is /var/folders/…, a symlink to /private/var/folders/…: anything that
+// resolves a real path — as the sweep's resolver and git both do — answers the /private form,
+// and the comparison failed on every Mac while passing on CI's Linux, which has no such link.
+const tmpRoot = (prefix) => realpathSync(mkdtempSync(path.join(tmpdir(), prefix)));
 const { isPublishable } = require('../scripts/bongos/publish-manifest.js');
 
 test('the sweep and every core file it requires are in the published package', () => {
@@ -50,7 +56,7 @@ test('its target-instance resolver searches the same packages, in the same order
 });
 
 test('coreModulePathFrom finds a target instance\'s INSTALLED core, root first', () => {
-  const inst = mkdtempSync(path.join(tmpdir(), 'sweep-home-'));
+  const inst = tmpRoot('sweep-home-');
   const pkg = path.join(inst, 'node_modules', '@bongos', 'core', 'scripts', 'bongos');
   mkdirSync(pkg, { recursive: true });
   writeFileSync(path.join(pkg, 'upgrade.js'), '');
@@ -62,11 +68,11 @@ test('coreModulePathFrom finds a target instance\'s INSTALLED core, root first',
 });
 
 test('run from elsewhere, it reads the roster named by --instance and says which core is sweeping', () => {
-  const rosterRoot = mkdtempSync(path.join(tmpdir(), 'sweep-roster-'));
+  const rosterRoot = tmpRoot('sweep-roster-');
   mkdirSync(path.join(rosterRoot, 'config'));
   writeFileSync(path.join(rosterRoot, 'config', 'update-subscriptions.json'),
     JSON.stringify({ instances: [{ slug: 'held', dir: path.join(rosterRoot, 'nowhere'), channel: 'pinned' }] }));
-  const cwd = mkdtempSync(path.join(tmpdir(), 'sweep-cwd-'));
+  const cwd = tmpRoot('sweep-cwd-');
   const r = spawnSync(process.execPath, [SWEEP, '--instance', rosterRoot], { cwd, encoding: 'utf8', env: { ...process.env, DATABASE_URL: '', PGDATABASE: '' } });
   assert.equal(r.status, 0, r.stderr);
   assert.match(r.stdout, new RegExp(`update-sweep · running from .+ \\(core \\d+\\.\\d+\\.\\d+\\) · roster ${rosterRoot.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&')}`));
@@ -75,7 +81,7 @@ test('run from elsewhere, it reads the roster named by --instance and says which
 });
 
 test('without --instance it reads the roster in its working directory (the unit\'s WorkingDirectory)', () => {
-  const cwd = mkdtempSync(path.join(tmpdir(), 'sweep-cwd-'));
+  const cwd = tmpRoot('sweep-cwd-');
   const r = spawnSync(process.execPath, [SWEEP], { cwd, encoding: 'utf8', env: { ...process.env, DATABASE_URL: '', PGDATABASE: '' } });
   assert.equal(r.status, 0, r.stderr);
   assert.match(r.stdout, /no roster file — nothing subscribed/);

package/tests/wedge_remedy.mjs

@@ -75,7 +75,11 @@ await t('a cloud-host project is fixed in ITS folder, not the control plane\'s',
 await t('disk full: prunes only THIS database\'s dumps, keeping the newest week', () => {
   const p = W.planRemedy(inst(), 'disk_full', { selfRoot, backupDir: '/var/backups/gds' });
   assert.match(p.cmd, /^find \/var\/backups\/gds -maxdepth 1 -type f -name 'charter-\[0-9\]/);
-  assert.match(p.cmd, new RegExp(`head -n -${W.DUMP_KEEP_FLOOR} \\| xargs -r rm -f --$`));
+  // All-but-the-last-K in POSIX awk, never `head -n -K`: that is a GNU extension BSD/macOS
+  // head refuses outright, so the pipeline deleted nothing on a Mac (task 1005096).
+  assert.match(p.cmd, new RegExp(`awk -v k=${W.DUMP_KEEP_FLOOR} `));
+  assert.match(p.cmd, /\| xargs rm -f --$/);
+  assert.doesNotMatch(p.cmd, /head -n -/, 'GNU-only; BSD head answers "illegal line count"');
   assert.equal(W.DUMP_KEEP_FLOOR, 7);
 });