From 5804131c99b585c0b47a3545011e305157722ffe Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Tue, 13 Oct 2020 12:17:23 -0700 Subject: [PATCH] chore: bump folio to 0.3.9, use fixture timeout (#4118) --- .github/workflows/tests.yml | 10 +++++----- package-lock.json | 14 +++++++------- package.json | 2 +- test/playwright.fixtures.ts | 3 +++ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2a87d08c7a..48320a40cd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,7 +37,7 @@ jobs: # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. # Enable core dumps in the subshell. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && npx folio test/ --workers=1 --forbid-only --timeout=30000 --global-timeout=5400000 --retries=3 --reporter=dot,json && npm run coverage" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && npx folio test/ --workers=1 --forbid-only --global-timeout=5400000 --retries=3 --reporter=dot,json && npm run coverage" env: BROWSER: ${{ matrix.browser }} FOLIO_JSON_OUTPUT_NAME: "test-results/report.json" @@ -63,7 +63,7 @@ jobs: - uses: microsoft/playwright-github-action@v1 - run: npm ci - run: npm run build - - run: npx folio test/ --workers=1 --forbid-only --timeout=30000 --global-timeout=5400000 --retries=3 --reporter=dot,json --shard=${{ matrix.shard }}/2 + - run: npx folio test/ --workers=1 --forbid-only --global-timeout=5400000 --retries=3 --reporter=dot,json --shard=${{ matrix.shard }}/2 env: BROWSER: ${{ matrix.browser }} FOLIO_JSON_OUTPUT_NAME: "test-results/report.json" @@ -91,7 +91,7 @@ jobs: - uses: microsoft/playwright-github-action@v1 - run: npm ci - run: npm run build - - run: npx folio test/ --workers=1 --forbid-only --timeout=30000 --global-timeout=5400000 --retries=3 --reporter=dot,json + - run: npx folio test/ --workers=1 --forbid-only --global-timeout=5400000 --retries=3 --reporter=dot,json shell: bash env: BROWSER: ${{ matrix.browser }} @@ -142,7 +142,7 @@ jobs: # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. # Enable core dumps in the subshell. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && npx folio test/ --workers=1 --forbid-only --timeout=30000 --global-timeout=5400000 --retries=3 --reporter=dot,json" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && npx folio test/ --workers=1 --forbid-only --global-timeout=5400000 --retries=3 --reporter=dot,json" if: ${{ always() }} env: BROWSER: ${{ matrix.browser }} @@ -175,7 +175,7 @@ jobs: # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. # Enable core dumps in the subshell. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && npx folio test/ --workers=1 --forbid-only --timeout=30000 --global-timeout=5400000 --retries=3 --reporter=dot,json" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && npx folio test/ --workers=1 --forbid-only --global-timeout=5400000 --retries=3 --reporter=dot,json" env: BROWSER: ${{ matrix.browser }} PWWIRE: true diff --git a/package-lock.json b/package-lock.json index 2dce5769d3..9cdbdb9f3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "playwright-internal", - "version": "1.4.0-post", + "version": "1.5.0-post", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2966,9 +2966,9 @@ "optional": true }, "escalade": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz", - "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, "escape-string-regexp": { @@ -3650,9 +3650,9 @@ } }, "folio": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/folio/-/folio-0.3.8.tgz", - "integrity": "sha512-7dD6dJJ/oJBQXoFo4Xui7rrmF/FUW/UIgGBYSdpk5luYcCP26TsYBWz2mF+fJGwuIajbipoeieT+9NWsHz+iQA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/folio/-/folio-0.3.9.tgz", + "integrity": "sha512-BlqAAJxXDA1NviOAL16+QIAR339ULjseV2RJjfJvvY2nmxzeHeIiPpdH3noAmwlE6I9i/c/1lsuIAPfj7stPSw==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", diff --git a/package.json b/package.json index 770684da4a..dfc3ad598e 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "electron": "^9.2.1", "eslint": "^7.7.0", "eslint-plugin-notice": "^0.9.10", - "folio": "=0.3.8", + "folio": "=0.3.9", "formidable": "^1.2.2", "ncp": "^2.0.0", "node-stream-zip": "^1.11.3", diff --git a/test/playwright.fixtures.ts b/test/playwright.fixtures.ts index 5c648fded5..ab9e623d63 100644 --- a/test/playwright.fixtures.ts +++ b/test/playwright.fixtures.ts @@ -26,6 +26,9 @@ import type { Browser, BrowserContext, BrowserContextOptions, BrowserType, Launc import * as path from 'path'; export { expect, config } from 'folio'; +// Test timeout for e2e tests is 30 seconds. +config.timeout = 30000; + // Parameters ------------------------------------------------------------------ // ... these can be used to run tests in different modes.