Skip to content

Commit

Permalink
fix: hanging tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@Equartey
Equartey committed Jun 26, 2024
1 parent a1a05cc commit d0499c8
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 132 deletions.
256 changes: 128 additions & 128 deletions .github/workflows/amplify_api_example.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,136 +6,136 @@ on:
- main
- stable
paths:
- ".github/workflows/amplify_api_example.yaml"
- ".github/workflows/e2e_android.yaml"
- ".github/workflows/e2e_ios.yaml"
- ".github/workflows/e2e_linux.yaml"
- ".github/workflows/e2e_web.yaml"
- ".github/workflows/e2e_windows.yaml"
- ".github/workflows/flutter_vm.yaml"
- "packages/amplify/amplify_flutter/lib/**/*.dart"
- "packages/amplify/amplify_flutter/pubspec.yaml"
- "packages/amplify_core/lib/**/*.dart"
- "packages/amplify_core/pubspec.yaml"
- "packages/amplify_lints/lib/**/*.yaml"
- "packages/amplify_lints/pubspec.yaml"
- "packages/analytics/amplify_analytics_pinpoint/android/**/*"
- "packages/analytics/amplify_analytics_pinpoint/lib/**/*.dart"
- "packages/analytics/amplify_analytics_pinpoint/pubspec.yaml"
- "packages/analytics/amplify_analytics_pinpoint_dart/lib/**/*.dart"
- "packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml"
- "packages/api/amplify_api/example/**/*.dart"
- "packages/api/amplify_api/example/**/*.yaml"
- "packages/api/amplify_api/example/lib/**/*"
- "packages/api/amplify_api/example/test/**/*"
- "packages/api/amplify_api/lib/**/*.dart"
- "packages/api/amplify_api/pubspec.yaml"
- "packages/api/amplify_api_dart/lib/**/*.dart"
- "packages/api/amplify_api_dart/pubspec.yaml"
- "packages/auth/amplify_auth_cognito/android/**/*"
- "packages/auth/amplify_auth_cognito/darwin/**/*"
- "packages/auth/amplify_auth_cognito/lib/**/*.dart"
- "packages/auth/amplify_auth_cognito/pubspec.yaml"
- "packages/auth/amplify_auth_cognito_dart/lib/**/*.dart"
- "packages/auth/amplify_auth_cognito_dart/pubspec.yaml"
- "packages/authenticator/amplify_authenticator/lib/**/*.dart"
- "packages/authenticator/amplify_authenticator/pubspec.yaml"
- "packages/aws_common/lib/**/*.dart"
- "packages/aws_common/pubspec.yaml"
- "packages/aws_signature_v4/lib/**/*.dart"
- "packages/aws_signature_v4/pubspec.yaml"
- "packages/common/amplify_db_common/android/**/*"
- "packages/common/amplify_db_common/ios/**/*"
- "packages/common/amplify_db_common/lib/**/*.dart"
- "packages/common/amplify_db_common/linux/**/*"
- "packages/common/amplify_db_common/macos/**/*"
- "packages/common/amplify_db_common/pubspec.yaml"
- "packages/common/amplify_db_common/windows/**/*"
- "packages/common/amplify_db_common_dart/lib/**/*.dart"
- "packages/common/amplify_db_common_dart/pubspec.yaml"
- "packages/secure_storage/amplify_secure_storage/android/**/*"
- "packages/secure_storage/amplify_secure_storage/ios/**/*"
- "packages/secure_storage/amplify_secure_storage/lib/**/*.dart"
- "packages/secure_storage/amplify_secure_storage/macos/**/*"
- "packages/secure_storage/amplify_secure_storage/pubspec.yaml"
- "packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart"
- "packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml"
- "packages/smithy/smithy/lib/**/*.dart"
- "packages/smithy/smithy/pubspec.yaml"
- "packages/smithy/smithy_aws/lib/**/*.dart"
- "packages/smithy/smithy_aws/pubspec.yaml"
- "packages/smithy/smithy_codegen/lib/**/*.dart"
- "packages/smithy/smithy_codegen/pubspec.yaml"
- "packages/worker_bee/worker_bee/lib/**/*.dart"
- "packages/worker_bee/worker_bee/pubspec.yaml"
- "packages/worker_bee/worker_bee_builder/lib/**/*.dart"
- "packages/worker_bee/worker_bee_builder/pubspec.yaml"
- '.github/workflows/amplify_api_example.yaml'
- '.github/workflows/e2e_android.yaml'
- '.github/workflows/e2e_ios.yaml'
- '.github/workflows/e2e_linux.yaml'
- '.github/workflows/e2e_web.yaml'
- '.github/workflows/e2e_windows.yaml'
- '.github/workflows/flutter_vm.yaml'
- 'packages/amplify/amplify_flutter/lib/**/*.dart'
- 'packages/amplify/amplify_flutter/pubspec.yaml'
- 'packages/amplify_core/lib/**/*.dart'
- 'packages/amplify_core/pubspec.yaml'
- 'packages/amplify_lints/lib/**/*.yaml'
- 'packages/amplify_lints/pubspec.yaml'
- 'packages/analytics/amplify_analytics_pinpoint/android/**/*'
- 'packages/analytics/amplify_analytics_pinpoint/lib/**/*.dart'
- 'packages/analytics/amplify_analytics_pinpoint/pubspec.yaml'
- 'packages/analytics/amplify_analytics_pinpoint_dart/lib/**/*.dart'
- 'packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml'
- 'packages/api/amplify_api/example/**/*.dart'
- 'packages/api/amplify_api/example/**/*.yaml'
- 'packages/api/amplify_api/example/lib/**/*'
- 'packages/api/amplify_api/example/test/**/*'
- 'packages/api/amplify_api/lib/**/*.dart'
- 'packages/api/amplify_api/pubspec.yaml'
- 'packages/api/amplify_api_dart/lib/**/*.dart'
- 'packages/api/amplify_api_dart/pubspec.yaml'
- 'packages/auth/amplify_auth_cognito/android/**/*'
- 'packages/auth/amplify_auth_cognito/darwin/**/*'
- 'packages/auth/amplify_auth_cognito/lib/**/*.dart'
- 'packages/auth/amplify_auth_cognito/pubspec.yaml'
- 'packages/auth/amplify_auth_cognito_dart/lib/**/*.dart'
- 'packages/auth/amplify_auth_cognito_dart/pubspec.yaml'
- 'packages/authenticator/amplify_authenticator/lib/**/*.dart'
- 'packages/authenticator/amplify_authenticator/pubspec.yaml'
- 'packages/aws_common/lib/**/*.dart'
- 'packages/aws_common/pubspec.yaml'
- 'packages/aws_signature_v4/lib/**/*.dart'
- 'packages/aws_signature_v4/pubspec.yaml'
- 'packages/common/amplify_db_common/android/**/*'
- 'packages/common/amplify_db_common/ios/**/*'
- 'packages/common/amplify_db_common/lib/**/*.dart'
- 'packages/common/amplify_db_common/linux/**/*'
- 'packages/common/amplify_db_common/macos/**/*'
- 'packages/common/amplify_db_common/pubspec.yaml'
- 'packages/common/amplify_db_common/windows/**/*'
- 'packages/common/amplify_db_common_dart/lib/**/*.dart'
- 'packages/common/amplify_db_common_dart/pubspec.yaml'
- 'packages/secure_storage/amplify_secure_storage/android/**/*'
- 'packages/secure_storage/amplify_secure_storage/ios/**/*'
- 'packages/secure_storage/amplify_secure_storage/lib/**/*.dart'
- 'packages/secure_storage/amplify_secure_storage/macos/**/*'
- 'packages/secure_storage/amplify_secure_storage/pubspec.yaml'
- 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart'
- 'packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml'
- 'packages/smithy/smithy/lib/**/*.dart'
- 'packages/smithy/smithy/pubspec.yaml'
- 'packages/smithy/smithy_aws/lib/**/*.dart'
- 'packages/smithy/smithy_aws/pubspec.yaml'
- 'packages/smithy/smithy_codegen/lib/**/*.dart'
- 'packages/smithy/smithy_codegen/pubspec.yaml'
- 'packages/worker_bee/worker_bee/lib/**/*.dart'
- 'packages/worker_bee/worker_bee/pubspec.yaml'
- 'packages/worker_bee/worker_bee_builder/lib/**/*.dart'
- 'packages/worker_bee/worker_bee_builder/pubspec.yaml'
pull_request:
paths:
- ".github/workflows/amplify_api_example.yaml"
- ".github/workflows/e2e_android.yaml"
- ".github/workflows/e2e_ios.yaml"
- ".github/workflows/e2e_linux.yaml"
- ".github/workflows/e2e_web.yaml"
- ".github/workflows/e2e_windows.yaml"
- ".github/workflows/flutter_vm.yaml"
- "packages/amplify/amplify_flutter/lib/**/*.dart"
- "packages/amplify/amplify_flutter/pubspec.yaml"
- "packages/amplify_core/lib/**/*.dart"
- "packages/amplify_core/pubspec.yaml"
- "packages/amplify_lints/lib/**/*.yaml"
- "packages/amplify_lints/pubspec.yaml"
- "packages/analytics/amplify_analytics_pinpoint/android/**/*"
- "packages/analytics/amplify_analytics_pinpoint/lib/**/*.dart"
- "packages/analytics/amplify_analytics_pinpoint/pubspec.yaml"
- "packages/analytics/amplify_analytics_pinpoint_dart/lib/**/*.dart"
- "packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml"
- "packages/api/amplify_api/example/**/*.dart"
- "packages/api/amplify_api/example/**/*.yaml"
- "packages/api/amplify_api/example/lib/**/*"
- "packages/api/amplify_api/example/test/**/*"
- "packages/api/amplify_api/lib/**/*.dart"
- "packages/api/amplify_api/pubspec.yaml"
- "packages/api/amplify_api_dart/lib/**/*.dart"
- "packages/api/amplify_api_dart/pubspec.yaml"
- "packages/auth/amplify_auth_cognito/android/**/*"
- "packages/auth/amplify_auth_cognito/darwin/**/*"
- "packages/auth/amplify_auth_cognito/lib/**/*.dart"
- "packages/auth/amplify_auth_cognito/pubspec.yaml"
- "packages/auth/amplify_auth_cognito_dart/lib/**/*.dart"
- "packages/auth/amplify_auth_cognito_dart/pubspec.yaml"
- "packages/authenticator/amplify_authenticator/lib/**/*.dart"
- "packages/authenticator/amplify_authenticator/pubspec.yaml"
- "packages/aws_common/lib/**/*.dart"
- "packages/aws_common/pubspec.yaml"
- "packages/aws_signature_v4/lib/**/*.dart"
- "packages/aws_signature_v4/pubspec.yaml"
- "packages/common/amplify_db_common/android/**/*"
- "packages/common/amplify_db_common/ios/**/*"
- "packages/common/amplify_db_common/lib/**/*.dart"
- "packages/common/amplify_db_common/linux/**/*"
- "packages/common/amplify_db_common/macos/**/*"
- "packages/common/amplify_db_common/pubspec.yaml"
- "packages/common/amplify_db_common/windows/**/*"
- "packages/common/amplify_db_common_dart/lib/**/*.dart"
- "packages/common/amplify_db_common_dart/pubspec.yaml"
- "packages/secure_storage/amplify_secure_storage/android/**/*"
- "packages/secure_storage/amplify_secure_storage/ios/**/*"
- "packages/secure_storage/amplify_secure_storage/lib/**/*.dart"
- "packages/secure_storage/amplify_secure_storage/macos/**/*"
- "packages/secure_storage/amplify_secure_storage/pubspec.yaml"
- "packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart"
- "packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml"
- "packages/smithy/smithy/lib/**/*.dart"
- "packages/smithy/smithy/pubspec.yaml"
- "packages/smithy/smithy_aws/lib/**/*.dart"
- "packages/smithy/smithy_aws/pubspec.yaml"
- "packages/smithy/smithy_codegen/lib/**/*.dart"
- "packages/smithy/smithy_codegen/pubspec.yaml"
- "packages/worker_bee/worker_bee/lib/**/*.dart"
- "packages/worker_bee/worker_bee/pubspec.yaml"
- "packages/worker_bee/worker_bee_builder/lib/**/*.dart"
- "packages/worker_bee/worker_bee_builder/pubspec.yaml"
- '.github/workflows/amplify_api_example.yaml'
- '.github/workflows/e2e_android.yaml'
- '.github/workflows/e2e_ios.yaml'
- '.github/workflows/e2e_linux.yaml'
- '.github/workflows/e2e_web.yaml'
- '.github/workflows/e2e_windows.yaml'
- '.github/workflows/flutter_vm.yaml'
- 'packages/amplify/amplify_flutter/lib/**/*.dart'
- 'packages/amplify/amplify_flutter/pubspec.yaml'
- 'packages/amplify_core/lib/**/*.dart'
- 'packages/amplify_core/pubspec.yaml'
- 'packages/amplify_lints/lib/**/*.yaml'
- 'packages/amplify_lints/pubspec.yaml'
- 'packages/analytics/amplify_analytics_pinpoint/android/**/*'
- 'packages/analytics/amplify_analytics_pinpoint/lib/**/*.dart'
- 'packages/analytics/amplify_analytics_pinpoint/pubspec.yaml'
- 'packages/analytics/amplify_analytics_pinpoint_dart/lib/**/*.dart'
- 'packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml'
- 'packages/api/amplify_api/example/**/*.dart'
- 'packages/api/amplify_api/example/**/*.yaml'
- 'packages/api/amplify_api/example/lib/**/*'
- 'packages/api/amplify_api/example/test/**/*'
- 'packages/api/amplify_api/lib/**/*.dart'
- 'packages/api/amplify_api/pubspec.yaml'
- 'packages/api/amplify_api_dart/lib/**/*.dart'
- 'packages/api/amplify_api_dart/pubspec.yaml'
- 'packages/auth/amplify_auth_cognito/android/**/*'
- 'packages/auth/amplify_auth_cognito/darwin/**/*'
- 'packages/auth/amplify_auth_cognito/lib/**/*.dart'
- 'packages/auth/amplify_auth_cognito/pubspec.yaml'
- 'packages/auth/amplify_auth_cognito_dart/lib/**/*.dart'
- 'packages/auth/amplify_auth_cognito_dart/pubspec.yaml'
- 'packages/authenticator/amplify_authenticator/lib/**/*.dart'
- 'packages/authenticator/amplify_authenticator/pubspec.yaml'
- 'packages/aws_common/lib/**/*.dart'
- 'packages/aws_common/pubspec.yaml'
- 'packages/aws_signature_v4/lib/**/*.dart'
- 'packages/aws_signature_v4/pubspec.yaml'
- 'packages/common/amplify_db_common/android/**/*'
- 'packages/common/amplify_db_common/ios/**/*'
- 'packages/common/amplify_db_common/lib/**/*.dart'
- 'packages/common/amplify_db_common/linux/**/*'
- 'packages/common/amplify_db_common/macos/**/*'
- 'packages/common/amplify_db_common/pubspec.yaml'
- 'packages/common/amplify_db_common/windows/**/*'
- 'packages/common/amplify_db_common_dart/lib/**/*.dart'
- 'packages/common/amplify_db_common_dart/pubspec.yaml'
- 'packages/secure_storage/amplify_secure_storage/android/**/*'
- 'packages/secure_storage/amplify_secure_storage/ios/**/*'
- 'packages/secure_storage/amplify_secure_storage/lib/**/*.dart'
- 'packages/secure_storage/amplify_secure_storage/macos/**/*'
- 'packages/secure_storage/amplify_secure_storage/pubspec.yaml'
- 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart'
- 'packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml'
- 'packages/smithy/smithy/lib/**/*.dart'
- 'packages/smithy/smithy/pubspec.yaml'
- 'packages/smithy/smithy_aws/lib/**/*.dart'
- 'packages/smithy/smithy_aws/pubspec.yaml'
- 'packages/smithy/smithy_codegen/lib/**/*.dart'
- 'packages/smithy/smithy_codegen/pubspec.yaml'
- 'packages/worker_bee/worker_bee/lib/**/*.dart'
- 'packages/worker_bee/worker_bee/pubspec.yaml'
- 'packages/worker_bee/worker_bee_builder/lib/**/*.dart'
- 'packages/worker_bee/worker_bee_builder/pubspec.yaml'
schedule:
- cron: "0 13 * * *" # Everyday at 06:00 PST
workflow_dispatch:
Expand Down
5 changes: 4 additions & 1 deletion packages/api/amplify_api/example/integration_test/graphql/api_key_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ void main({bool useExistingTestUser = false, bool useGen2 = false}) {
() {
late StreamController<ApiHubEvent> hubEventsController;
late Stream<ApiHubEvent> hubEvents;
late StreamSubscription<ApiHubEvent> hubEventsSubscription;
setUpAll(() async {
if (!useExistingTestUser) {
await signUpTestUser(useEmail: useGen2);
Expand All @@ -64,7 +65,8 @@ void main({bool useExistingTestUser = false, bool useGen2 = false}) {

hubEventsController = StreamController.broadcast();
hubEvents = hubEventsController.stream;
Amplify.Hub.listen(HubChannel.Api, hubEventsController.add);
hubEventsSubscription =
Amplify.Hub.listen(HubChannel.Api, hubEventsController.add);
});

tearDownAll(() async {
Expand All @@ -73,6 +75,7 @@ void main({bool useExistingTestUser = false, bool useGen2 = false}) {
await deleteTestUser();
}

await hubEventsSubscription.cancel();
await hubEventsController.close();
Amplify.Hub.close();
});
Expand Down
3 changes: 0 additions & 3 deletions packages/api/amplify_api/example/integration_test/graphql/user_pools_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@ void main({bool useExistingTestUser = false, bool useGen2 = false}) {
);
final updateRes = await Amplify.API.mutate(request: updateReq).response;
final mutatedPost = updateRes.data;
if (!useGen2) {
expect(updateRes, hasNoGraphQLErrors);
}
expect(mutatedPost?.title, equals(updatedTitle));
});

Expand Down
3 changes: 3 additions & 0 deletions packages/api/amplify_api/example/integration_test/main_test.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import 'package:amplify_flutter/amplify_flutter.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';

Expand All @@ -22,6 +23,7 @@ void main() async {

tearDownAll(() async {
await deleteTestUser();
await Amplify.reset();
});

graph_api_key_test.main(useExistingTestUser: true);
Expand All @@ -39,6 +41,7 @@ void main() async {

tearDownAll(() async {
await deleteTestUser(useEmail: true);
await Amplify.reset();
});

graph_api_key_test.main(
Expand Down

0 comments on commit d0499c8

Please sign in to comment.