Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: use fulfillment(of:) and address intermittent integration test failures #3305

Merged
merged 10 commits into from
Oct 18, 2023
Merged
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
analytics-integration-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/Analytics/Tests/AnalyticsHostApp
scheme: AWSPinpointAnalyticsPluginIntegrationTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

analytics-integration-test-tvOS:
runs-on: macos-13
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integ_test_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
prepare-for-test:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_api_functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-functional-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginFunctionalTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-functional-test-tvOS:
runs-on: macos-13
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-graphql-auth-directive-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginGraphQLAuthDirectiveTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-graphql-auth-directive-test-tvOS:
runs-on: macos-13
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_api_graphql_iam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-graphql-iam-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginGraphQLIAMTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-graphql-iam-test-tvOS:
runs-on: macos-13
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_api_graphql_lambda_auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-graphql-lambda-auth-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginGraphQLLambdaAuthTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-graphql-lambda-auth-test-tvOS:
runs-on: macos-13
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_api_graphql_lazy_load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-lazy-load-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginLazyLoadTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-lazy-load-test-tvOS:
runs-on: macos-13
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_api_graphql_user_pool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-graphql-user-pool-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginGraphQLUserPoolTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-graphql-user-pool-test-tvOS:
runs-on: macos-13
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_api_rest_iam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-rest-iam-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginRESTIAMTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-rest-iam-test-tvOS:
runs-on: macos-13
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_api_rest_user_pool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
api-rest-user-pool-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
scheme: AWSAPIPluginRESTUserPoolTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

api-rest-user-pool-test-tvOS:
runs-on: macos-13
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/integ_test_auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

auth-ui-integration-test-iOS:
runs-on: macos-13
runs-on: macos-12
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -115,5 +115,3 @@ jobs:
with:
project_path: ./AmplifyPlugins/Auth/Tests/AuthHostedUIApp/
scheme: AuthHostedUIApp
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'
10 changes: 6 additions & 4 deletions .github/workflows/integ_test_datastore_auth_cognito.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ permissions:

jobs:
datastore-integration-auth-cognito-test-iOS:
timeout-minutes: 30
runs-on: macos-12
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -33,9 +33,11 @@ jobs:
with:
project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
scheme: AWSDataStorePluginAuthCognitoTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-auth-cognito-test-tvOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -64,7 +66,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-auth-cognito-test-watchOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integ_test_datastore_auth_iam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
datastore-integration-auth-iam-test-iOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-auth-iam-test-tvOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-auth-iam-test-watchOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integ_test_datastore_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
datastore-integration-test-base-iOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-test-base-tvOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-test-base-watchOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integ_test_datastore_cpk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
datastore-integration-cpk-test-iOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-cpk-test-tvOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-cpk-test-watchOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integ_test_datastore_lazy_load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
datastore-integration-lazy-load-test-iOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-lazy-load-test-tvOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-lazy-load-test-watchOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integ_test_datastore_multi_auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
datastore-integration-multi-auth-test-iOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-multi-auth-test-tvOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-multi-auth-test-watchOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integ_test_datastore_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
datastore-integration-v2-test-iOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-v2-test-tvOS:
timeout-minutes: 30
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
xcode_path: '/Applications/Xcode_14.3.app'

datastore-integration-v2-test-watchOS:
timeout-minutes: 45
timeout-minutes: 60
runs-on: macos-13
environment: IntegrationTest
steps:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integ_test_geo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
geo-integration-test-iOS:
runs-on: macos-12
runs-on: macos-13
environment: IntegrationTest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
Expand All @@ -32,6 +32,8 @@ jobs:
with:
project_path: ./AmplifyPlugins/Geo/Tests/GeoHostApp/
scheme: AWSLocationGeoPluginIntegrationTests
destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest'
xcode_path: '/Applications/Xcode_14.3.app'

geo-integration-test-tvOS:
runs-on: macos-13
Expand Down
Loading
Loading