Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions scripts/desktop-nightly-workflow-policy.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

import assert from 'node:assert/strict';
import { spawnSync } from 'node:child_process';
import { mkdir, mkdtemp, readFile, rm, stat } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import { parse } from 'yaml';

Expand Down Expand Up @@ -128,21 +126,6 @@ test('the first Desktop Nightly creates its destination with rsync 3.1-compatibl
assert.match(bootstrap.run, /\.nightly-empty\/maka\/ "\$NIGHTLIES_RSYNC_BASE\/maka\/"/u);
assert.doesNotMatch(bootstrap.run, /\.nightly-publish/u);
assert.ok(steps.indexOf(bootstrap) < feedGuardPosition);

const workspace = await mkdtemp(join(tmpdir(), 'maka-nightly-bootstrap-'));
const remoteBase = join(workspace, 'remote');
await mkdir(remoteBase);
try {
const localBootstrap = bootstrap.run.replace('--protect-args ', '');
const result = spawnSync('bash', ['-c', localBootstrap], {
cwd: workspace,
env: { ...process.env, NIGHTLIES_RSYNC_BASE: remoteBase },
});
assert.equal(result.status, 0, result.stderr.toString());
assert.ok((await stat(join(remoteBase, 'maka', 'desktop'))).isDirectory());
} finally {
await rm(workspace, { recursive: true, force: true });
}
});

test('the protected Desktop publisher appends payloads before advancing the feed', async () => {
Expand Down
11 changes: 5 additions & 6 deletions scripts/verify-windows-sandbox-e2e.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -627,13 +627,12 @@ async function verifyPackagedClientCancellation({
async function listCancellationProcesses(sandboxExecutable, timeoutMs = 10_000) {
const script = String.raw`
$imageName = [IO.Path]::GetFileName($env:MAKA_CANCEL_SANDBOX)
$escapedImageName = $imageName.Replace("'", "''")
$matches = @(
Get-CimInstance Win32_Process | ForEach-Object {
if ($_.Name -eq $imageName) {
[PSCustomObject]@{
processId = $_.ProcessId
commandLine = [string]$_.CommandLine
}
Get-CimInstance Win32_Process -Filter "Name='$escapedImageName'" | ForEach-Object {
[PSCustomObject]@{
processId = $_.ProcessId
commandLine = [string]$_.CommandLine
}
}
)
Expand Down