Skip to content

Commit d642454

Browse files
committed
Increase cdxgen test timeout
1 parent 0077525 commit d642454

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

src/commands/manifest/convert_gradle_to_maven.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ export async function convertGradleToMaven(
3131
}
3232

3333
try {
34-
// Run sbt with the init script we provide which should yield zero or more pom files.
35-
// We have to figure out where to store those pom files such that we can upload them and predict them through the GitHub API.
36-
// We could do a .socket folder. We could do a socket.pom.gz with all the poms, although I'd prefer something plain-text if it is to be committed.
34+
// Run sbt with the init script we provide which should yield zero or more
35+
// pom files. We have to figure out where to store those pom files such that
36+
// we can upload them and predict them through the GitHub API. We could do a
37+
// .socket folder. We could do a socket.pom.gz with all the poms, although
38+
// I'd prefer something plain-text if it is to be committed.
3739

3840
// Note: init.gradle will be exported by .config/rollup.dist.config.mjs
3941
const initLocation = path.join(constants.rootDistPath, 'init.gradle')

src/constants.ts

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -254,19 +254,13 @@ const lazyNodeHardenFlags = () =>
254254
? []
255255
: // Harden Node security.
256256
// https://nodejs.org/en/learn/getting-started/security-best-practices
257-
[
258-
'--disable-proto',
259-
'delete',
260-
// Lazily access constants.WIN32.
261-
constants.WIN32
262-
? // We have contributed the following patches to our dependencies to make
263-
// Node's --frozen-intrinsics workable.
264-
// √ https://github.com/SBoudrias/Inquirer.js/pull/1683
265-
// √ https://github.com/pnpm/components/pull/23
266-
['--frozen-intrinsics']
267-
: [],
268-
'--no-deprecation'
269-
]
257+
constants.WIN32
258+
? []
259+
: // We have contributed the following patches to our dependencies to make
260+
// Node's --frozen-intrinsics workable.
261+
// √ https://github.com/SBoudrias/Inquirer.js/pull/1683
262+
// √ https://github.com/pnpm/components/pull/23
263+
['--disable-proto', 'delete', '--frozen-intrinsics', '--no-deprecation']
270264

271265
const lazyRootBinPath = () =>
272266
// Lazily access constants.rootPath.

test/socket-cdxgen.test.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ const testPath = __dirname
1717
const npmFixturesPath = path.join(testPath, 'socket-npm-fixtures')
1818

1919
const spawnOpts: PromiseSpawnOptions = {
20-
cwd: npmFixturesPath
20+
cwd: npmFixturesPath,
21+
env: {
22+
SOCKET_CLI_DEBUG: '1'
23+
}
2124
}
2225

2326
describe('Socket cdxgen command', async () => {
@@ -27,8 +30,8 @@ describe('Socket cdxgen command', async () => {
2730
it(
2831
'should forwards known commands to cdxgen',
2932
{
30-
// Takes ~10s in CI
31-
timeout: 20_000
33+
// Takes ~120s in CI
34+
timeout: 120_000
3235
},
3336
async () => {
3437
for (const command of ['-h', '--help']) {

0 commit comments

Comments
 (0)