From 6697ae1d5efbbbe9a546739c0b2bcb3d057d790b Mon Sep 17 00:00:00 2001 From: Jordan Gensler Date: Tue, 13 Sep 2022 12:58:38 -0700 Subject: [PATCH] Fix tests --- .github/workflows/explorer-client-prs.yml | 2 +- .github/workflows/ts-sdk.yml | 2 +- sdk/typescript/test/tsconfig.json | 2 +- sdk/typescript/vitest.config.ts | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/explorer-client-prs.yml b/.github/workflows/explorer-client-prs.yml index 5a20ac726d85f..80ae56a4a98b2 100644 --- a/.github/workflows/explorer-client-prs.yml +++ b/.github/workflows/explorer-client-prs.yml @@ -86,7 +86,7 @@ jobs: uses: cypress-io/github-action@v4 with: install: false - start: pnpm dlx concurrently 'cargo run --bin sui-test-validator' 'pnpm dev:local' + start: pnpm dlx concurrently --kill-others 'cargo run --bin sui-test-validator' 'pnpm dev:local' working-directory: ./explorer/client spec: cypress/e2e/localnet/* # Wait on faucet and explorer: diff --git a/.github/workflows/ts-sdk.yml b/.github/workflows/ts-sdk.yml index 77cb6cda90989..c59e84573da72 100644 --- a/.github/workflows/ts-sdk.yml +++ b/.github/workflows/ts-sdk.yml @@ -52,4 +52,4 @@ jobs: - name: Install dependencies run: pnpm install --frozen-lockfile - name: Run e2e tests - run: pnpm dlx concurrently 'cargo run --bin sui-test-validator' 'pnpm --filter @mysten/sui.js test:e2e' + run: pnpm dlx concurrently --kill-others --success command-1 'cargo run --bin sui-test-validator' 'pnpm --filter @mysten/sui.js test:e2e' diff --git a/sdk/typescript/test/tsconfig.json b/sdk/typescript/test/tsconfig.json index 51db59505f694..d0832c5c4d007 100644 --- a/sdk/typescript/test/tsconfig.json +++ b/sdk/typescript/test/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.json", "include": ["./"], "compilerOptions": { "resolveJsonModule": true diff --git a/sdk/typescript/vitest.config.ts b/sdk/typescript/vitest.config.ts index 495273a43a0c9..6b5286d0efe3d 100644 --- a/sdk/typescript/vitest.config.ts +++ b/sdk/typescript/vitest.config.ts @@ -6,6 +6,8 @@ import { configDefaults, defineConfig } from 'vitest/config'; export default defineConfig({ test: { exclude: [...configDefaults.exclude, 'bcs/**'], + minThreads: 1, + maxThreads: 8, }, resolve: { alias: {