From 15e0d71c49161faa2e1bfb152be8af8f6ee65268 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Thu, 9 Jan 2025 17:00:38 -0300 Subject: [PATCH] chore: test:e2e defaults to no-docker (#10966) Since we run this more often locally, default to no-docker. --- Dockerfile.end-to-end | 2 +- yarn-project/end-to-end/package.json | 5 +++-- yarn-project/foundation/src/testing/files/index.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile.end-to-end b/Dockerfile.end-to-end index 9022084db3b..fa3684649f0 100644 --- a/Dockerfile.end-to-end +++ b/Dockerfile.end-to-end @@ -15,4 +15,4 @@ COPY /usr/src /usr/src COPY /anvil /opt/foundry/bin/anvil WORKDIR /usr/src/yarn-project/end-to-end -ENTRYPOINT ["yarn", "test:e2e-no-docker"] +ENTRYPOINT ["yarn", "test:e2e"] diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index a9b1f9d2d68..7f998abcfea 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -15,8 +15,9 @@ "clean": "rm -rf ./dest .tsbuildinfo", "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test:with-alerts": "./scripts/test-with-alerts.sh", - "test:e2e": "./scripts/test.sh simple", - "test:e2e-no-docker": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit", + "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit", + "test:e2e-docker": "./scripts/test.sh simple", + "test:e2e-no-docker": "echo 'The command test:e2e-no-docker is now the same as test:e2e. You can now run this dropping the no-docker suffix.'; yarn test:e2e", "test:profile": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 0x --output-dir \"flame_graph/{pid}.0x\" -- node --experimental-vm-modules ../node_modules/jest/bin/jest.js --runInBand --testTimeout=300000 --forceExit", "serve:flames": "python3 -m http.server --directory \"flame_graph\" 8000", "test:debug": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --inspect --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit", diff --git a/yarn-project/foundation/src/testing/files/index.ts b/yarn-project/foundation/src/testing/files/index.ts index d068bf35434..ee82490fbdf 100644 --- a/yarn-project/foundation/src/testing/files/index.ts +++ b/yarn-project/foundation/src/testing/files/index.ts @@ -43,7 +43,7 @@ export function updateInlineTestData(targetFileFromRepoRoot: string, itemName: s /** * Updates the sample Prover.toml files in noir-projects/noir-protocol-circuits/crates/. * @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set - * To re-gen, run 'AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn test:e2e-no-docker full.test ' + * To re-gen, run 'AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn test:e2e full.test ' */ export function updateProtocolCircuitSampleInputs(circuitName: string, value: string) { const logger = createConsoleLogger('aztec:testing:test_data');