From f1b613ec56228346c664fb3f6d2eab15c3f1dc62 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 09:37:58 -0500 Subject: [PATCH 01/25] init --- package-lock.json | 146 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 2 files changed, 147 insertions(+) diff --git a/package-lock.json b/package-lock.json index aa0d3491a6..c17c80a8e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,6 +62,7 @@ "lodash.clonedeep": "^4.5.0", "lodash.uniq": "^4.5.0", "mocha": "8.1.3", + "mocha-junit-reporter": "2.0.2", "mustache": "^4.0.1", "openzeppelin-solidity-2.3.0": "npm:openzeppelin-solidity@2.3.0", "p-limit": "1.3.0", @@ -16679,6 +16680,17 @@ "node": ">=8.9.0" } }, + "node_modules/md5": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", + "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", + "dev": true, + "dependencies": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "~1.1.6" + } + }, "node_modules/md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -16689,6 +16701,12 @@ "safe-buffer": "^5.1.2" } }, + "node_modules/md5/node_modules/is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -17115,6 +17133,58 @@ "url": "https://opencollective.com/mochajs" } }, + "node_modules/mocha-junit-reporter": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.2.tgz", + "integrity": "sha512-vYwWq5hh3v1lG0gdQCBxwNipBfvDiAM1PHroQRNp96+2l72e9wEUTw+mzoK+O0SudgfQ7WvTQZ9Nh3qkAYAjfg==", + "dev": true, + "dependencies": { + "debug": "^2.2.0", + "md5": "^2.1.0", + "mkdirp": "~0.5.1", + "strip-ansi": "^6.0.1", + "xml": "^1.0.0" + }, + "peerDependencies": { + "mocha": ">=2.2.5" + } + }, + "node_modules/mocha-junit-reporter/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha-junit-reporter/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/mocha-junit-reporter/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/mocha-junit-reporter/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mocha/node_modules/chokidar": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", @@ -25538,6 +25608,12 @@ "cookiejar": "^2.1.1" } }, + "node_modules/xml": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", + "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=", + "dev": true + }, "node_modules/xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", @@ -42719,6 +42795,25 @@ "integrity": "sha512-iJIUcQWA88IJB/5L15GnJVnSQJmf/YaxxV6zRavv83HILHaJQb6y0iFyDMdDO0gN8X37tdxmAOrH/P8B6RB8sQ==", "dev": true }, + "md5": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", + "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", + "dev": true, + "requires": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "~1.1.6" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + } + } + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -43243,6 +43338,51 @@ } } }, + "mocha-junit-reporter": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.2.tgz", + "integrity": "sha512-vYwWq5hh3v1lG0gdQCBxwNipBfvDiAM1PHroQRNp96+2l72e9wEUTw+mzoK+O0SudgfQ7WvTQZ9Nh3qkAYAjfg==", + "dev": true, + "requires": { + "debug": "^2.2.0", + "md5": "^2.1.0", + "mkdirp": "~0.5.1", + "strip-ansi": "^6.0.1", + "xml": "^1.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, "mock-fs": { "version": "4.14.0", "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz", @@ -50055,6 +50195,12 @@ "cookiejar": "^2.1.1" } }, + "xml": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", + "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=", + "dev": true + }, "xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", diff --git a/package.json b/package.json index ac952133da..004dfb72fa 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "lodash.clonedeep": "^4.5.0", "lodash.uniq": "^4.5.0", "mocha": "8.1.3", + "mocha-junit-reporter": "2.0.2", "mustache": "^4.0.1", "openzeppelin-solidity-2.3.0": "npm:openzeppelin-solidity@2.3.0", "p-limit": "1.3.0", From ddd95bac7014160380e34933188fb434ce23ebcd Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 09:38:25 -0500 Subject: [PATCH 02/25] add suggested snippet --- .circleci/src/jobs/job-unit-tests.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 4aa4bb18df..970629045e 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -25,3 +25,14 @@ steps: root: . paths: - gasReporterOutput-*.json + - run: npm install + - run: mkdir ~/junit + - run: + command: mocha test --reporter mocha-junit-reporter + environment: + MOCHA_FILE: ~/junit/test-results.xml + when: always + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit From 7d6a2b6f45c1df94e64425e3a5a1791eb8304718 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 09:42:34 -0500 Subject: [PATCH 03/25] improvements --- .circleci/src/jobs/job-unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 970629045e..4c44d84d79 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -25,10 +25,9 @@ steps: root: . paths: - gasReporterOutput-*.json - - run: npm install - run: mkdir ~/junit - run: - command: mocha test --reporter mocha-junit-reporter + command: mocha test ./test/contracts --reporter mocha-junit-reporter environment: MOCHA_FILE: ~/junit/test-results.xml when: always From 439062358a25a82cb98ef1bb74d1c006f91dc507 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 09:52:28 -0500 Subject: [PATCH 04/25] as args --- .circleci/src/jobs/job-unit-tests.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 4c44d84d79..7d2ca1df17 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -7,13 +7,14 @@ steps: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer + - run: mkdir ~/junit - run: name: Test and output gas used command: | set +e circleci tests glob 'test/contracts/*.js' | circleci tests split | - xargs npm test -- --gas + xargs npm test -- --gas --reporter mocha-junit-reporter --reporter-options mochaFile=~/junit/test-results.xml EXIT_CODE=$? printf "\\n" exit $EXIT_CODE @@ -25,12 +26,6 @@ steps: root: . paths: - gasReporterOutput-*.json - - run: mkdir ~/junit - - run: - command: mocha test ./test/contracts --reporter mocha-junit-reporter - environment: - MOCHA_FILE: ~/junit/test-results.xml - when: always - store_test_results: path: ~/junit - store_artifacts: From 64fff89b96531ef6c9f4786e24e4802d29fed63e Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 10:34:56 -0500 Subject: [PATCH 05/25] use hardhat config --- .circleci/src/jobs/job-unit-tests.yml | 2 +- hardhat.config.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 7d2ca1df17..34659333f9 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -14,7 +14,7 @@ steps: set +e circleci tests glob 'test/contracts/*.js' | circleci tests split | - xargs npm test -- --gas --reporter mocha-junit-reporter --reporter-options mochaFile=~/junit/test-results.xml + xargs npm test -- --gas EXIT_CODE=$? printf "\\n" exit $EXIT_CODE diff --git a/hardhat.config.js b/hardhat.config.js index 34cf6e727e..dab15e69b3 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -92,5 +92,9 @@ module.exports = { mocha: { timeout: 120e3, // 120s retries: 3, + reporter: 'mocha-junit-reporter', + reporterOptions: { + mochaFile: '~/junit/test-results.xml' + } }, }; From 9c99a29724eba86baf6f42ad15a1121a02b03585 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 11:33:04 -0500 Subject: [PATCH 06/25] move mocha config --- hardhat.config.js | 4 ---- hardhat/tasks/task-test.js | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hardhat.config.js b/hardhat.config.js index dab15e69b3..34cf6e727e 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -92,9 +92,5 @@ module.exports = { mocha: { timeout: 120e3, // 120s retries: 3, - reporter: 'mocha-junit-reporter', - reporterOptions: { - mochaFile: '~/junit/test-results.xml' - } }, }; diff --git a/hardhat/tasks/task-test.js b/hardhat/tasks/task-test.js index 75aaf70504..07b53add6a 100644 --- a/hardhat/tasks/task-test.js +++ b/hardhat/tasks/task-test.js @@ -54,5 +54,10 @@ task('test') hre.config.gasReporter.outputFile = gasOutputFile; } + hre.config.mocha.reporter = 'mocha-junit-reporter'; + hre.config.mocha.reporterOptions = { + mochaFile: '~/junit/test-results.xml', + }; + await runSuper(taskArguments); }); From d7ed74210b6a36b7241284e65c752af044bdc77b Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 12:32:22 -0500 Subject: [PATCH 07/25] updates --- .circleci/src/jobs/job-fork-tests-ovm.yml | 5 +++++ .circleci/src/jobs/job-fork-tests.yml | 5 +++++ .circleci/src/jobs/job-integration-tests.yml | 5 +++++ .circleci/src/jobs/job-unit-tests.yml | 2 +- hardhat/tasks/task-test.js | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index 4d9ba6e7b1..a5834457c2 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -19,3 +19,8 @@ steps: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; + - run: mkdir ~/junit + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 9f6d7b54ca..1f04ae0bf6 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -19,3 +19,8 @@ steps: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; + - run: mkdir ~/junit + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 971bb25df3..33c1dfbf4f 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -43,3 +43,8 @@ steps: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy + - run: mkdir ~/junit + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 34659333f9..68b4a2c58b 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -7,7 +7,6 @@ steps: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer - - run: mkdir ~/junit - run: name: Test and output gas used command: | @@ -26,6 +25,7 @@ steps: root: . paths: - gasReporterOutput-*.json + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/hardhat/tasks/task-test.js b/hardhat/tasks/task-test.js index 07b53add6a..8caac3b54d 100644 --- a/hardhat/tasks/task-test.js +++ b/hardhat/tasks/task-test.js @@ -56,7 +56,7 @@ task('test') hre.config.mocha.reporter = 'mocha-junit-reporter'; hre.config.mocha.reporterOptions = { - mochaFile: '~/junit/test-results.xml', + mochaFile: '~/junit/test-results.[hash].xml', }; await runSuper(taskArguments); From 8d077aa1ef02fcdbc204bebaae540fd97d940073 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 12:35:33 -0500 Subject: [PATCH 08/25] rebuild --- .circleci/config.yml | 20 ++++++++++++++++++++ hardhat.config.js | 4 ++++ hardhat/tasks/task-test.js | 5 ----- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9286c7850..6abfb19c36 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,6 +67,11 @@ jobs: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; + - run: mkdir ~/junit + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit job-fork-tests: working_directory: ~/repo docker: @@ -92,6 +97,11 @@ jobs: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; + - run: mkdir ~/junit + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit job-integration-tests: working_directory: ~/repo machine: @@ -137,6 +147,11 @@ jobs: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy + - run: mkdir ~/junit + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit job-lint: working_directory: ~/repo docker: @@ -361,6 +376,11 @@ jobs: root: . paths: - gasReporterOutput-*.json + - run: mkdir ~/junit + - store_test_results: + path: ~/junit + - store_artifacts: + path: ~/junit job-validate-deployments: working_directory: ~/repo docker: diff --git a/hardhat.config.js b/hardhat.config.js index 34cf6e727e..5cfc63d4d8 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -92,5 +92,9 @@ module.exports = { mocha: { timeout: 120e3, // 120s retries: 3, + reporter: 'mocha-junit-reporter', + reporterOptions: { + mochaFile: '~/junit/test-results.xml', + }, }, }; diff --git a/hardhat/tasks/task-test.js b/hardhat/tasks/task-test.js index 8caac3b54d..75aaf70504 100644 --- a/hardhat/tasks/task-test.js +++ b/hardhat/tasks/task-test.js @@ -54,10 +54,5 @@ task('test') hre.config.gasReporter.outputFile = gasOutputFile; } - hre.config.mocha.reporter = 'mocha-junit-reporter'; - hre.config.mocha.reporterOptions = { - mochaFile: '~/junit/test-results.[hash].xml', - }; - await runSuper(taskArguments); }); From 43d8a9bc5257cdc9d524fdf91b820466f72cef18 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 12:43:18 -0500 Subject: [PATCH 09/25] alt config --- hardhat.config.js | 4 - hardhat/tasks/task-test.js | 5 + ~/junit/test-results.xml | 11088 +++++++++++++++++++++++++++++++++++ 3 files changed, 11093 insertions(+), 4 deletions(-) create mode 100644 ~/junit/test-results.xml diff --git a/hardhat.config.js b/hardhat.config.js index 5cfc63d4d8..34cf6e727e 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -92,9 +92,5 @@ module.exports = { mocha: { timeout: 120e3, // 120s retries: 3, - reporter: 'mocha-junit-reporter', - reporterOptions: { - mochaFile: '~/junit/test-results.xml', - }, }, }; diff --git a/hardhat/tasks/task-test.js b/hardhat/tasks/task-test.js index 75aaf70504..8caac3b54d 100644 --- a/hardhat/tasks/task-test.js +++ b/hardhat/tasks/task-test.js @@ -54,5 +54,10 @@ task('test') hre.config.gasReporter.outputFile = gasOutputFile; } + hre.config.mocha.reporter = 'mocha-junit-reporter'; + hre.config.mocha.reporterOptions = { + mochaFile: '~/junit/test-results.[hash].xml', + }; + await runSuper(taskArguments); }); diff --git a/~/junit/test-results.xml b/~/junit/test-results.xml new file mode 100644 index 0000000000..8da492def7 --- /dev/null +++ b/~/junit/test-results.xml @@ -0,0 +1,11088 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) + at processTicksAndRejections (internal/process/task_queues.js:93:5) + at Context. (test/contracts/SupplySchedule.js:296:5)]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From dee56c4984f66253910aaa065b9d6d2c0ff7d98d Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 13:02:09 -0500 Subject: [PATCH 10/25] fix --- hardhat.config.js | 4 + hardhat/tasks/task-test.js | 5 - ...sults.46ae4abb101a65d2ce42416c48f4747b.xml | 61 + ~/junit/test-results.xml | 11088 ---------------- 4 files changed, 65 insertions(+), 11093 deletions(-) create mode 100644 ~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml delete mode 100644 ~/junit/test-results.xml diff --git a/hardhat.config.js b/hardhat.config.js index 34cf6e727e..6426dd154c 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -92,5 +92,9 @@ module.exports = { mocha: { timeout: 120e3, // 120s retries: 3, + reporter: 'mocha-junit-reporter', + reporterOptions: { + mochaFile: '~/junit/test-results.[hash].xml', + }, }, }; diff --git a/hardhat/tasks/task-test.js b/hardhat/tasks/task-test.js index 8caac3b54d..75aaf70504 100644 --- a/hardhat/tasks/task-test.js +++ b/hardhat/tasks/task-test.js @@ -54,10 +54,5 @@ task('test') hre.config.gasReporter.outputFile = gasOutputFile; } - hre.config.mocha.reporter = 'mocha-junit-reporter'; - hre.config.mocha.reporterOptions = { - mochaFile: '~/junit/test-results.[hash].xml', - }; - await runSuper(taskArguments); }); diff --git a/~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml b/~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml new file mode 100644 index 0000000000..992024b101 --- /dev/null +++ b/~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/~/junit/test-results.xml b/~/junit/test-results.xml deleted file mode 100644 index 8da492def7..0000000000 --- a/~/junit/test-results.xml +++ /dev/null @@ -1,11088 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ) - at processTicksAndRejections (internal/process/task_queues.js:93:5) - at Context. (test/contracts/SupplySchedule.js:296:5)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From fb621ddc7d8acdff94576ae2194b5eb4fed4d236 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 13:08:18 -0500 Subject: [PATCH 11/25] remove mkdir --- .circleci/src/jobs/job-fork-tests-ovm.yml | 1 - .circleci/src/jobs/job-fork-tests.yml | 1 - .circleci/src/jobs/job-integration-tests.yml | 1 - .circleci/src/jobs/job-unit-tests.yml | 1 - ...sults.46ae4abb101a65d2ce42416c48f4747b.xml | 61 ------------------- 5 files changed, 65 deletions(-) delete mode 100644 ~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index a5834457c2..7fc68249be 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -19,7 +19,6 @@ steps: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 1f04ae0bf6..9ebf88083d 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -19,7 +19,6 @@ steps: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 33c1dfbf4f..21d614b52c 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -43,7 +43,6 @@ steps: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 68b4a2c58b..814d8eb408 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -25,7 +25,6 @@ steps: root: . paths: - gasReporterOutput-*.json - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml b/~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml deleted file mode 100644 index 992024b101..0000000000 --- a/~/junit/test-results.46ae4abb101a65d2ce42416c48f4747b.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 504c9335fc9ac7f310cdd37ec314dbb4a9e4786c Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 13:14:07 -0500 Subject: [PATCH 12/25] path --- .circleci/src/jobs/job-fork-tests-ovm.yml | 4 ++-- .circleci/src/jobs/job-fork-tests.yml | 4 ++-- .circleci/src/jobs/job-integration-tests.yml | 4 ++-- .circleci/src/jobs/job-unit-tests.yml | 4 ++-- hardhat.config.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index 7fc68249be..b61c1845fd 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - store_test_results: - path: ~/junit + path: ./junit - store_artifacts: - path: ~/junit + path: ./junit diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 9ebf88083d..4ec7288d96 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - store_test_results: - path: ~/junit + path: ./junit - store_artifacts: - path: ~/junit + path: ./junit diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 21d614b52c..ce07bfcaae 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -44,6 +44,6 @@ steps: command: | npx hardhat test:integration:dual --deploy - store_test_results: - path: ~/junit + path: ./junit - store_artifacts: - path: ~/junit + path: ./junit diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 814d8eb408..9ecfa68a5a 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -26,6 +26,6 @@ steps: paths: - gasReporterOutput-*.json - store_test_results: - path: ~/junit + path: ./junit - store_artifacts: - path: ~/junit + path: ./junit diff --git a/hardhat.config.js b/hardhat.config.js index 6426dd154c..a5fa081a11 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -94,7 +94,7 @@ module.exports = { retries: 3, reporter: 'mocha-junit-reporter', reporterOptions: { - mochaFile: '~/junit/test-results.[hash].xml', + mochaFile: './junit/test-results.[hash].xml', }, }, }; From 6b1253f5760e4a10da7f014f733c91e503014219 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 13:36:04 -0500 Subject: [PATCH 13/25] remove hash? --- .circleci/src/jobs/job-fork-tests-ovm.yml | 4 ++-- .circleci/src/jobs/job-fork-tests.yml | 4 ++-- .circleci/src/jobs/job-integration-tests.yml | 4 ++-- .circleci/src/jobs/job-unit-tests.yml | 4 ++-- hardhat.config.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index b61c1845fd..7fc68249be 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - store_test_results: - path: ./junit + path: ~/junit - store_artifacts: - path: ./junit + path: ~/junit diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 4ec7288d96..9ebf88083d 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - store_test_results: - path: ./junit + path: ~/junit - store_artifacts: - path: ./junit + path: ~/junit diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index ce07bfcaae..21d614b52c 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -44,6 +44,6 @@ steps: command: | npx hardhat test:integration:dual --deploy - store_test_results: - path: ./junit + path: ~/junit - store_artifacts: - path: ./junit + path: ~/junit diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 9ecfa68a5a..814d8eb408 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -26,6 +26,6 @@ steps: paths: - gasReporterOutput-*.json - store_test_results: - path: ./junit + path: ~/junit - store_artifacts: - path: ./junit + path: ~/junit diff --git a/hardhat.config.js b/hardhat.config.js index a5fa081a11..5cfc63d4d8 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -94,7 +94,7 @@ module.exports = { retries: 3, reporter: 'mocha-junit-reporter', reporterOptions: { - mochaFile: './junit/test-results.[hash].xml', + mochaFile: '~/junit/test-results.xml', }, }, }; From 3ac30ddf44f451898fcae47180affe8f5bef4263 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 13:42:12 -0500 Subject: [PATCH 14/25] try other config --- .circleci/src/jobs/job-fork-tests-ovm.yml | 4 ++-- .circleci/src/jobs/job-fork-tests.yml | 4 ++-- .circleci/src/jobs/job-integration-tests.yml | 4 ++-- .circleci/src/jobs/job-unit-tests.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index 7fc68249be..0c102e36ab 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - store_test_results: - path: ~/junit + path: reports - store_artifacts: - path: ~/junit + path: ./reports/mocha/test-results.xml \ No newline at end of file diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 9ebf88083d..b9bfaf1a50 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - store_test_results: - path: ~/junit + path: reports - store_artifacts: - path: ~/junit + path: ./reports/mocha/test-results.xml \ No newline at end of file diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 21d614b52c..38901f4de4 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -44,6 +44,6 @@ steps: command: | npx hardhat test:integration:dual --deploy - store_test_results: - path: ~/junit + path: reports - store_artifacts: - path: ~/junit + path: ./reports/mocha/test-results.xml \ No newline at end of file diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 814d8eb408..a0078ba93c 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -26,6 +26,6 @@ steps: paths: - gasReporterOutput-*.json - store_test_results: - path: ~/junit + path: reports - store_artifacts: - path: ~/junit + path: ./reports/mocha/test-results.xml From 9c4b68fb8c67e6ec465202c9053816a674d9f5e6 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 13:51:09 -0500 Subject: [PATCH 15/25] test --- .circleci/config.yml | 5 +---- .circleci/src/jobs/job-fork-tests-ovm.yml | 4 ++-- .circleci/src/jobs/job-fork-tests.yml | 4 ++-- .circleci/src/jobs/job-integration-tests.yml | 4 ++-- .circleci/src/jobs/job-prepare.yml | 1 + .circleci/src/jobs/job-unit-tests.yml | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6abfb19c36..b74bb1e6fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,7 +67,6 @@ jobs: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -97,7 +96,6 @@ jobs: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -147,7 +145,6 @@ jobs: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -208,6 +205,7 @@ jobs: paths: - node_modules - .npm-cache + - run: mkdir ~/junit job-simulate-release: working_directory: ~/repo docker: @@ -376,7 +374,6 @@ jobs: root: . paths: - gasReporterOutput-*.json - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index 0c102e36ab..7fc68249be 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - store_test_results: - path: reports + path: ~/junit - store_artifacts: - path: ./reports/mocha/test-results.xml \ No newline at end of file + path: ~/junit diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index b9bfaf1a50..9ebf88083d 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -20,6 +20,6 @@ steps: npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - store_test_results: - path: reports + path: ~/junit - store_artifacts: - path: ./reports/mocha/test-results.xml \ No newline at end of file + path: ~/junit diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 38901f4de4..21d614b52c 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -44,6 +44,6 @@ steps: command: | npx hardhat test:integration:dual --deploy - store_test_results: - path: reports + path: ~/junit - store_artifacts: - path: ./reports/mocha/test-results.xml \ No newline at end of file + path: ~/junit diff --git a/.circleci/src/jobs/job-prepare.yml b/.circleci/src/jobs/job-prepare.yml index 01a2d47613..2cf3eb463a 100644 --- a/.circleci/src/jobs/job-prepare.yml +++ b/.circleci/src/jobs/job-prepare.yml @@ -25,3 +25,4 @@ steps: paths: - node_modules - .npm-cache + - run: mkdir ~/junit diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index a0078ba93c..814d8eb408 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -26,6 +26,6 @@ steps: paths: - gasReporterOutput-*.json - store_test_results: - path: reports + path: ~/junit - store_artifacts: - path: ./reports/mocha/test-results.xml + path: ~/junit From d9e6176d87c83ce46b2eacac80b5698f24143da4 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 13:58:52 -0500 Subject: [PATCH 16/25] mkdir --- .circleci/config.yml | 5 ++++- .circleci/src/jobs/job-fork-tests-ovm.yml | 1 + .circleci/src/jobs/job-fork-tests.yml | 1 + .circleci/src/jobs/job-integration-tests.yml | 1 + .circleci/src/jobs/job-prepare.yml | 1 - .circleci/src/jobs/job-unit-tests.yml | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b74bb1e6fc..6abfb19c36 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,6 +67,7 @@ jobs: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -96,6 +97,7 @@ jobs: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -145,6 +147,7 @@ jobs: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -205,7 +208,6 @@ jobs: paths: - node_modules - .npm-cache - - run: mkdir ~/junit job-simulate-release: working_directory: ~/repo docker: @@ -374,6 +376,7 @@ jobs: root: . paths: - gasReporterOutput-*.json + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index 7fc68249be..a5834457c2 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -19,6 +19,7 @@ steps: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 9ebf88083d..1f04ae0bf6 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -19,6 +19,7 @@ steps: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 21d614b52c..33c1dfbf4f 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -43,6 +43,7 @@ steps: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-prepare.yml b/.circleci/src/jobs/job-prepare.yml index 2cf3eb463a..01a2d47613 100644 --- a/.circleci/src/jobs/job-prepare.yml +++ b/.circleci/src/jobs/job-prepare.yml @@ -25,4 +25,3 @@ steps: paths: - node_modules - .npm-cache - - run: mkdir ~/junit diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 814d8eb408..68b4a2c58b 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -25,6 +25,7 @@ steps: root: . paths: - gasReporterOutput-*.json + - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: From e6580f1ada289e64a8528311edc0acff5257bd94 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 14:12:54 -0500 Subject: [PATCH 17/25] directory --- .circleci/config.yml | 6 ++---- .circleci/src/jobs/job-fork-tests-ovm.yml | 1 - .circleci/src/jobs/job-fork-tests.yml | 1 - .circleci/src/jobs/job-integration-tests.yml | 1 - .circleci/src/jobs/job-prepare.yml | 2 ++ .circleci/src/jobs/job-unit-tests.yml | 1 - 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6abfb19c36..2b3cd98301 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,7 +67,6 @@ jobs: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -97,7 +96,6 @@ jobs: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -147,7 +145,6 @@ jobs: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: @@ -203,11 +200,13 @@ jobs: paths: - node_modules - .npm-cache + - run: mkdir ~/junit - persist_to_workspace: root: . paths: - node_modules - .npm-cache + - junit job-simulate-release: working_directory: ~/repo docker: @@ -376,7 +375,6 @@ jobs: root: . paths: - gasReporterOutput-*.json - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index a5834457c2..7fc68249be 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -19,7 +19,6 @@ steps: else npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 1f04ae0bf6..9ebf88083d 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -19,7 +19,6 @@ steps: else npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 33c1dfbf4f..21d614b52c 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -43,7 +43,6 @@ steps: name: Run dual layer 1 and layer 2 integration tests command: | npx hardhat test:integration:dual --deploy - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: diff --git a/.circleci/src/jobs/job-prepare.yml b/.circleci/src/jobs/job-prepare.yml index 01a2d47613..be40ef9097 100644 --- a/.circleci/src/jobs/job-prepare.yml +++ b/.circleci/src/jobs/job-prepare.yml @@ -20,8 +20,10 @@ steps: paths: - node_modules - .npm-cache + - run: mkdir ~/junit - persist_to_workspace: root: . paths: - node_modules - .npm-cache + - junit diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 68b4a2c58b..814d8eb408 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -25,7 +25,6 @@ steps: root: . paths: - gasReporterOutput-*.json - - run: mkdir ~/junit - store_test_results: path: ~/junit - store_artifacts: From 6db3adff33b70a7839cf909fbb39be8d0e93a57c Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 14:39:48 -0500 Subject: [PATCH 18/25] move mkdir again --- .circleci/config.yml | 6 ++++-- .circleci/src/jobs/job-fork-tests-ovm.yml | 1 + .circleci/src/jobs/job-fork-tests.yml | 1 + .circleci/src/jobs/job-integration-tests.yml | 1 + .circleci/src/jobs/job-prepare.yml | 4 +--- .circleci/src/jobs/job-unit-tests.yml | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b3cd98301..fe109ce630 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,6 +53,7 @@ jobs: - checkout - attach_workspace: at: . + - run: mkdir ~/junit - run: command: npm run fork:ovm background: true @@ -82,6 +83,7 @@ jobs: - checkout - attach_workspace: at: . + - run: mkdir ~/junit - run: command: npm run fork:mainnet background: true @@ -133,6 +135,7 @@ jobs: port: 8545 - cmd-wait-for-port: port: 9545 + - run: mkdir ~/junit - run: name: Run isolated layer 1 integration tests command: | @@ -200,13 +203,11 @@ jobs: paths: - node_modules - .npm-cache - - run: mkdir ~/junit - persist_to_workspace: root: . paths: - node_modules - .npm-cache - - junit job-simulate-release: working_directory: ~/repo docker: @@ -357,6 +358,7 @@ jobs: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer + - run: mkdir ~/junit - run: name: Test and output gas used command: | diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index 7fc68249be..a1b43db34b 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -4,6 +4,7 @@ steps: - checkout - attach_workspace: at: . + - run: mkdir ~/junit - run: command: npm run fork:ovm background: true diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index 9ebf88083d..b1a7320811 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -4,6 +4,7 @@ steps: - checkout - attach_workspace: at: . + - run: mkdir ~/junit - run: command: npm run fork:mainnet background: true diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 21d614b52c..735e2ee117 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -31,6 +31,7 @@ steps: port: 8545 - cmd-wait-for-port: port: 9545 + - run: mkdir ~/junit - run: name: Run isolated layer 1 integration tests command: | diff --git a/.circleci/src/jobs/job-prepare.yml b/.circleci/src/jobs/job-prepare.yml index be40ef9097..c2420f4885 100644 --- a/.circleci/src/jobs/job-prepare.yml +++ b/.circleci/src/jobs/job-prepare.yml @@ -20,10 +20,8 @@ steps: paths: - node_modules - .npm-cache - - run: mkdir ~/junit - persist_to_workspace: root: . paths: - node_modules - - .npm-cache - - junit + - .npm-cache \ No newline at end of file diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 814d8eb408..34659333f9 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -7,6 +7,7 @@ steps: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer + - run: mkdir ~/junit - run: name: Test and output gas used command: | From c136589793b9136fb7c63fc605a187abbaf5d03c Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 15:07:24 -0500 Subject: [PATCH 19/25] try tmp dir --- .circleci/src/jobs/job-fork-tests-ovm.yml | 6 +++--- .circleci/src/jobs/job-fork-tests.yml | 6 +++--- .circleci/src/jobs/job-integration-tests.yml | 6 +++--- .circleci/src/jobs/job-unit-tests.yml | 6 +++--- hardhat.config.js | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index a1b43db34b..3d89a3aa17 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -4,7 +4,7 @@ steps: - checkout - attach_workspace: at: . - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: command: npm run fork:ovm background: true @@ -21,6 +21,6 @@ steps: npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index b1a7320811..afbac91bf1 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -4,7 +4,7 @@ steps: - checkout - attach_workspace: at: . - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: command: npm run fork:mainnet background: true @@ -21,6 +21,6 @@ steps: npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index 735e2ee117..da38835720 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -31,7 +31,7 @@ steps: port: 8545 - cmd-wait-for-port: port: 9545 - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: name: Run isolated layer 1 integration tests command: | @@ -45,6 +45,6 @@ steps: command: | npx hardhat test:integration:dual --deploy - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index 34659333f9..a5e60f6de9 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -7,7 +7,7 @@ steps: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: name: Test and output gas used command: | @@ -27,6 +27,6 @@ steps: paths: - gasReporterOutput-*.json - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ diff --git a/hardhat.config.js b/hardhat.config.js index 5cfc63d4d8..ab3bd606f7 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -94,7 +94,7 @@ module.exports = { retries: 3, reporter: 'mocha-junit-reporter', reporterOptions: { - mochaFile: '~/junit/test-results.xml', + mochaFile: '/tmp/junit/test-results.xml', }, }, }; From a658dcc73dd0eb881b95239b9839d03f7ea41075 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 15:07:55 -0500 Subject: [PATCH 20/25] try tmp dir --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe109ce630..2c86dce18b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,7 +53,7 @@ jobs: - checkout - attach_workspace: at: . - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: command: npm run fork:ovm background: true @@ -69,9 +69,9 @@ jobs: npx hardhat test:integration:l2 --compile --deploy --use-sips --use-fork fi; - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ job-fork-tests: working_directory: ~/repo docker: @@ -83,7 +83,7 @@ jobs: - checkout - attach_workspace: at: . - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: command: npm run fork:mainnet background: true @@ -99,9 +99,9 @@ jobs: npx hardhat test:integration:l1 --compile --deploy --use-sips --use-fork --provider-port 9545 fi; - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ job-integration-tests: working_directory: ~/repo machine: @@ -135,7 +135,7 @@ jobs: port: 8545 - cmd-wait-for-port: port: 9545 - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: name: Run isolated layer 1 integration tests command: | @@ -149,9 +149,9 @@ jobs: command: | npx hardhat test:integration:dual --deploy - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ job-lint: working_directory: ~/repo docker: @@ -358,7 +358,7 @@ jobs: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer - - run: mkdir ~/junit + - run: mkdir /tmp/junit - run: name: Test and output gas used command: | @@ -378,9 +378,9 @@ jobs: paths: - gasReporterOutput-*.json - store_test_results: - path: ~/junit + path: /tmp/junit/ - store_artifacts: - path: ~/junit + path: /tmp/junit/ job-validate-deployments: working_directory: ~/repo docker: From a03b6de62cd3bba02f064279d9cf8e82a51e9afd Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 15:19:44 -0500 Subject: [PATCH 21/25] try with hash --- hardhat.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardhat.config.js b/hardhat.config.js index ab3bd606f7..48ea2f0230 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -94,7 +94,7 @@ module.exports = { retries: 3, reporter: 'mocha-junit-reporter', reporterOptions: { - mochaFile: '/tmp/junit/test-results.xml', + mochaFile: '/tmp/junit/test-results.[hash].xml', }, }, }; From db9aa81c3fb906b3b4d458af246a6f189a5c842b Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 15:30:51 -0500 Subject: [PATCH 22/25] move mkdir --- .circleci/config.yml | 5 +---- .circleci/src/jobs/job-fork-tests-ovm.yml | 1 - .circleci/src/jobs/job-fork-tests.yml | 1 - .circleci/src/jobs/job-integration-tests.yml | 1 - .circleci/src/jobs/job-prepare.yml | 4 +++- .circleci/src/jobs/job-unit-tests.yml | 1 - 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c86dce18b..2ffdce35c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,7 +53,6 @@ jobs: - checkout - attach_workspace: at: . - - run: mkdir /tmp/junit - run: command: npm run fork:ovm background: true @@ -83,7 +82,6 @@ jobs: - checkout - attach_workspace: at: . - - run: mkdir /tmp/junit - run: command: npm run fork:mainnet background: true @@ -135,7 +133,6 @@ jobs: port: 8545 - cmd-wait-for-port: port: 9545 - - run: mkdir /tmp/junit - run: name: Run isolated layer 1 integration tests command: | @@ -208,6 +205,7 @@ jobs: paths: - node_modules - .npm-cache + - run: mkdir /tmp/junit job-simulate-release: working_directory: ~/repo docker: @@ -358,7 +356,6 @@ jobs: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer - - run: mkdir /tmp/junit - run: name: Test and output gas used command: | diff --git a/.circleci/src/jobs/job-fork-tests-ovm.yml b/.circleci/src/jobs/job-fork-tests-ovm.yml index 3d89a3aa17..628172b3ca 100644 --- a/.circleci/src/jobs/job-fork-tests-ovm.yml +++ b/.circleci/src/jobs/job-fork-tests-ovm.yml @@ -4,7 +4,6 @@ steps: - checkout - attach_workspace: at: . - - run: mkdir /tmp/junit - run: command: npm run fork:ovm background: true diff --git a/.circleci/src/jobs/job-fork-tests.yml b/.circleci/src/jobs/job-fork-tests.yml index afbac91bf1..469314b7f7 100644 --- a/.circleci/src/jobs/job-fork-tests.yml +++ b/.circleci/src/jobs/job-fork-tests.yml @@ -4,7 +4,6 @@ steps: - checkout - attach_workspace: at: . - - run: mkdir /tmp/junit - run: command: npm run fork:mainnet background: true diff --git a/.circleci/src/jobs/job-integration-tests.yml b/.circleci/src/jobs/job-integration-tests.yml index da38835720..9e8ae1a276 100644 --- a/.circleci/src/jobs/job-integration-tests.yml +++ b/.circleci/src/jobs/job-integration-tests.yml @@ -31,7 +31,6 @@ steps: port: 8545 - cmd-wait-for-port: port: 9545 - - run: mkdir /tmp/junit - run: name: Run isolated layer 1 integration tests command: | diff --git a/.circleci/src/jobs/job-prepare.yml b/.circleci/src/jobs/job-prepare.yml index c2420f4885..88199acf53 100644 --- a/.circleci/src/jobs/job-prepare.yml +++ b/.circleci/src/jobs/job-prepare.yml @@ -24,4 +24,6 @@ steps: root: . paths: - node_modules - - .npm-cache \ No newline at end of file + - .npm-cache + - run: mkdir /tmp/junit + \ No newline at end of file diff --git a/.circleci/src/jobs/job-unit-tests.yml b/.circleci/src/jobs/job-unit-tests.yml index a5e60f6de9..2b68d64e58 100644 --- a/.circleci/src/jobs/job-unit-tests.yml +++ b/.circleci/src/jobs/job-unit-tests.yml @@ -7,7 +7,6 @@ steps: - attach_workspace: at: . - run: npx hardhat compile --showsize --optimizer - - run: mkdir /tmp/junit - run: name: Test and output gas used command: | From 3ce197929bd57d44cf0ff7f33270f7a61e391009 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 15:42:13 -0500 Subject: [PATCH 23/25] no mkdir test --- .circleci/src/jobs/job-prepare.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/src/jobs/job-prepare.yml b/.circleci/src/jobs/job-prepare.yml index 88199acf53..01a2d47613 100644 --- a/.circleci/src/jobs/job-prepare.yml +++ b/.circleci/src/jobs/job-prepare.yml @@ -25,5 +25,3 @@ steps: paths: - node_modules - .npm-cache - - run: mkdir /tmp/junit - \ No newline at end of file From 5b4b9ae48a526e6fa967e4d437762f2f25484122 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 15:42:29 -0500 Subject: [PATCH 24/25] no mkdir test --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ffdce35c9..eee5f78cf2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -205,7 +205,6 @@ jobs: paths: - node_modules - .npm-cache - - run: mkdir /tmp/junit job-simulate-release: working_directory: ~/repo docker: From eee427f8e55b96d289e3b4250c5625305f32fdb0 Mon Sep 17 00:00:00 2001 From: Noah Litvin Date: Fri, 4 Feb 2022 16:06:20 -0500 Subject: [PATCH 25/25] ci only --- hardhat.config.js | 4 ---- hardhat/tasks/task-test.js | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hardhat.config.js b/hardhat.config.js index 48ea2f0230..34cf6e727e 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -92,9 +92,5 @@ module.exports = { mocha: { timeout: 120e3, // 120s retries: 3, - reporter: 'mocha-junit-reporter', - reporterOptions: { - mochaFile: '/tmp/junit/test-results.[hash].xml', - }, }, }; diff --git a/hardhat/tasks/task-test.js b/hardhat/tasks/task-test.js index 75aaf70504..f9931f2b49 100644 --- a/hardhat/tasks/task-test.js +++ b/hardhat/tasks/task-test.js @@ -3,6 +3,7 @@ const { types, task, subtask } = require('hardhat/config'); const { TASK_TEST_RUN_MOCHA_TESTS } = require('hardhat/builtin-tasks/task-names'); const { gray, yellow } = require('chalk'); const optimizeIfRequired = require('../util/optimizeIfRequired'); +const isCI = require('is-ci'); // Override builtin "test:run-mocha-tests" subtask so we can use the local mocha // installation, which is up to date and allows us to run parallel tests. @@ -54,5 +55,14 @@ task('test') hre.config.gasReporter.outputFile = gasOutputFile; } + // When using CircleCI, output the test metadata + // See https://circleci.com/docs/2.0/collect-test-data + if (isCI) { + hre.config.mocha.reporter = 'mocha-junit-reporter'; + hre.config.mocha.reporterOptions = { + mochaFile: '/tmp/junit/test-results.[hash].xml', + }; + } + await runSuper(taskArguments); });