From 329adc731fc65fc31a609cbf878b62cd80bf06c0 Mon Sep 17 00:00:00 2001 From: Nikolas Rimikis Date: Thu, 26 Oct 2023 10:51:35 +0200 Subject: [PATCH] test(dynamite_end_to_end_test): migrate to dart test configuration Signed-off-by: Nikolas Rimikis --- .github/workflows/dart.yml | 3 ++- melos.yaml | 3 ++- packages/dynamite/dynamite_end_to_end_test/dart_test.yaml | 1 + .../dynamite_end_to_end_test/test/ensure_validity_test.dart | 2 +- tool/dart_test_base.yaml | 5 +++++ 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 packages/dynamite/dynamite_end_to_end_test/dart_test.yaml create mode 100644 tool/dart_test_base.yaml diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 78706c005ac..5ea276a780f 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -46,4 +46,5 @@ jobs: if [ -z "$packages" ]; then exit 0; fi packages_glob="$(printf ",%s" "${packages[@]}")" packages_glob="${packages_glob:1}" - melos exec --scope="$packages_glob" --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all)" + melos exec --scope="$packages_glob" --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all) -x source_verification" + melos exec --scope="$packages_glob" --concurrency=1 --fail-fast --dir-exists=test --file-exists=dart_test.yaml -- "flutter test --concurrency=1 -t source_verification" diff --git a/melos.yaml b/melos.yaml index 0d812d87dd1..a65cde6ddd8 100644 --- a/melos.yaml +++ b/melos.yaml @@ -22,6 +22,7 @@ scripts: format: dart format --fix --line-length 120 . format:check: dart format --output=none --set-exit-if-changed --line-length 120 . analyze: dart analyze --fatal-infos . - test: melos exec --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all)" + test: melos exec --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all) -x source_verification" + test:source_verification: melos exec --concurrency=1 --fail-fast --dir-exists=test --file-exists=dart_test.yaml -- "flutter test --concurrency=1 -t source_verification" generate:neon:build_runner: melos exec --scope="neon*" --file-exists="build.yaml" -- dart run build_runner build --delete-conflicting-outputs && melos run format generate:neon:l10n: melos exec --flutter --dir-exists="lib/l10n" flutter gen-l10n && melos run format diff --git a/packages/dynamite/dynamite_end_to_end_test/dart_test.yaml b/packages/dynamite/dynamite_end_to_end_test/dart_test.yaml new file mode 100644 index 00000000000..15d816e1e78 --- /dev/null +++ b/packages/dynamite/dynamite_end_to_end_test/dart_test.yaml @@ -0,0 +1 @@ +include: ../../../tool/dart_test_base.yaml diff --git a/packages/dynamite/dynamite_end_to_end_test/test/ensure_validity_test.dart b/packages/dynamite/dynamite_end_to_end_test/test/ensure_validity_test.dart index 37a272dd898..8d771dce7fc 100644 --- a/packages/dynamite/dynamite_end_to_end_test/test/ensure_validity_test.dart +++ b/packages/dynamite/dynamite_end_to_end_test/test/ensure_validity_test.dart @@ -8,6 +8,6 @@ void main() { packageRelativeDirectory: 'packages/dynamite/dynamite_end_to_end_test', customCommand: ['bash', 'generate.sh'], ), - timeout: const Timeout.factor(2), + tags: 'source_verification', ); } diff --git a/tool/dart_test_base.yaml b/tool/dart_test_base.yaml new file mode 100644 index 00000000000..e9dbd32d7ac --- /dev/null +++ b/tool/dart_test_base.yaml @@ -0,0 +1,5 @@ +tags: + integration: + retry: 3 + source_verification: + timeout: 20x