Skip to content

Commit acdd2dc

Browse files
thisisabhashthisisabhash
authored
chore: fix test workflows (#4057)
* chore(build): fix test workflows * chore: enable excluded API integration tests * chore: fix GraphQLWithUserPoolIntegrationTests * chore: fix RESTWithUserPoolIntegrationTests * chore: fix GraphQLLazyLoadCompositePKTests * chore: fix GraphQLWithIAMIntegrationTests * chore: GraphQLAuthDirectiveIntegrationTests * chore: add test schemes for watchOS destination * chore: add missing APIWatchApp imports * chore: revert AWSAPIPluginLazyLoadTests changes
1 parent 783c57f commit acdd2dc

19 files changed

+785
-11
lines changed

‎.github/workflows/integ_test_api.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,16 @@ jobs:
1919
secrets: inherit
2020

2121
graphql-user-pool-test:
22-
if: ${{ false }}
2322
name: GraphQL | User Pool Tests
2423
uses: ./.github/workflows/integ_test_api_graphql_user_pool.yml
2524
secrets: inherit
2625

2726
graphql-auth-directive-test:
28-
if: ${{ false }}
2927
name: GraphQL | Auth Directive Tests
3028
uses: ./.github/workflows/integ_test_api_graphql_auth_directive.yml
3129
secrets: inherit
3230

3331
graphql-iam-test:
34-
if: ${{ false }}
3532
name: GraphQL | IAM Tests
3633
uses: ./.github/workflows/integ_test_api_graphql_iam.yml
3734
secrets: inherit
@@ -48,7 +45,6 @@ jobs:
4845
secrets: inherit
4946

5047
rest-user-pool-test:
51-
if: ${{ false }}
5248
name: REST | User Pool Tests
5349
uses: ./.github/workflows/integ_test_api_rest_user_pool.yml
5450
secrets: inherit

‎.github/workflows/integ_test_api_graphql_auth_directive.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
exclude:
2929
- platform: ${{ github.event.inputs.ios == 'false' && 'iOS' || 'None' }}
3030
- platform: ${{ github.event.inputs.tvos == 'false' && 'tvOS' || 'None' }}
31+
- platform: ${{ github.event.inputs.watchos == 'false' && 'watchOS' || 'None' }}
3132
uses: ./.github/workflows/run_integration_tests.yml
3233
with:
33-
scheme: AWSAPIPluginGraphQLAuthDirectiveTests
34+
scheme: ${{ matrix.platform == 'watchOS' && 'AWSAPIPluginGraphQLAuthDirectiveTestsWatch' || 'AWSAPIPluginGraphQLAuthDirectiveTests' }}
3435
platform: ${{ matrix.platform }}
3536
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
3637
resource_subfolder: api

‎.github/workflows/integ_test_api_graphql_iam.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
exclude:
2929
- platform: ${{ github.event.inputs.ios == 'false' && 'iOS' || 'None' }}
3030
- platform: ${{ github.event.inputs.tvos == 'false' && 'tvOS' || 'None' }}
31+
- platform: ${{ github.event.inputs.watchos == 'false' && 'watchOS' || 'None' }}
3132
uses: ./.github/workflows/run_integration_tests.yml
3233
with:
33-
scheme: AWSAPIPluginGraphQLIAMTests
34+
scheme: ${{ matrix.platform == 'watchOS' && 'AWSAPIPluginGraphQLIAMTestsWatch' || 'AWSAPIPluginGraphQLIAMTests' }}
3435
platform: ${{ matrix.platform }}
3536
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
3637
resource_subfolder: api

‎.github/workflows/integ_test_api_rest_user_pool.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
exclude:
2929
- platform: ${{ github.event.inputs.ios == 'false' && 'iOS' || 'None' }}
3030
- platform: ${{ github.event.inputs.tvos == 'false' && 'tvOS' || 'None' }}
31+
- platform: ${{ github.event.inputs.watchos == 'false' && 'watchOS' || 'None' }}
3132
uses: ./.github/workflows/run_integration_tests.yml
3233
with:
33-
scheme: AWSAPIPluginRESTUserPoolTests
34+
scheme: ${{ matrix.platform == 'watchOS' && 'AWSAPIPluginRESTUserPoolTestsWatch' || 'AWSAPIPluginRESTUserPoolTests' }}
3435
platform: ${{ matrix.platform }}
3536
project_path: ./AmplifyPlugins/API/Tests/APIHostApp
3637
resource_subfolder: api

‎.swiftpm/xcode/xcshareddata/xcschemes/AWSCloudWatchLoggingPlugin.xcscheme‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@
6262
BlueprintName = "AWSCloudWatchLoggingPluginTests"
6363
ReferencedContainer = "container:">
6464
</BuildableReference>
65+
<SkippedTests>
66+
<Test
67+
Identifier = "AWSCloudWatchLoggingMonitorTests/testDelegateIsInvokedOnInterval()">
68+
</Test>
69+
</SkippedTests>
6570
</TestableReference>
6671
</Testables>
6772
</TestAction>

‎.swiftpm/xcode/xcshareddata/xcschemes/AWSS3StoragePlugin.xcscheme‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@
4848
BlueprintName = "AWSS3StoragePluginTests"
4949
ReferencedContainer = "container:">
5050
</BuildableReference>
51+
<SkippedTests>
52+
<Test
53+
Identifier = "DefaultStorageTransferDatabaseTests/testLoadPersistableTasks()">
54+
</Test>
55+
<Test
56+
Identifier = "DefaultStorageTransferDatabaseTests/testPrepareForBackground()">
57+
</Test>
58+
</SkippedTests>
5159
</TestableReference>
5260
</Testables>
5361
</TestAction>

‎AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj‎

Lines changed: 440 additions & 0 deletions
Large diffs are not rendered by default.

‎AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/xcshareddata/xcschemes/APIWatchApp.xcscheme‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1640"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "681B35282A4395730074F369"
19+
BuildableName = "APIWatchApp.app"
20+
BlueprintName = "APIWatchApp"
21+
ReferencedContainer = "container:APIHostApp.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
25+
</BuildAction>
26+
<TestAction
27+
buildConfiguration = "Debug"
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
shouldAutocreateTestPlan = "YES">
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "681B35282A4395730074F369"
48+
BuildableName = "APIWatchApp.app"
49+
BlueprintName = "APIWatchApp"
50+
ReferencedContainer = "container:APIHostApp.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "681B35282A4395730074F369"
65+
BuildableName = "APIWatchApp.app"
66+
BlueprintName = "APIWatchApp"
67+
ReferencedContainer = "container:APIHostApp.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/xcshareddata/xcschemes/AWSAPIPluginGraphQLAuthDirectiveTests.xcscheme‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1640"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
</BuildAction>
10+
<TestAction
11+
buildConfiguration = "Debug"
12+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
13+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
14+
shouldUseLaunchSchemeArgsEnv = "YES"
15+
shouldAutocreateTestPlan = "YES">
16+
<Testables>
17+
<TestableReference
18+
skipped = "NO">
19+
<BuildableReference
20+
BuildableIdentifier = "primary"
21+
BlueprintIdentifier = "21698A9428899818004BD994"
22+
BuildableName = "AWSAPIPluginGraphQLAuthDirectiveTests.xctest"
23+
BlueprintName = "AWSAPIPluginGraphQLAuthDirectiveTests"
24+
ReferencedContainer = "container:APIHostApp.xcodeproj">
25+
</BuildableReference>
26+
</TestableReference>
27+
</Testables>
28+
</TestAction>
29+
<LaunchAction
30+
buildConfiguration = "Debug"
31+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
32+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
33+
launchStyle = "0"
34+
useCustomWorkingDirectory = "NO"
35+
ignoresPersistentStateOnLaunch = "NO"
36+
debugDocumentVersioning = "YES"
37+
debugServiceExtension = "internal"
38+
allowLocationSimulation = "YES">
39+
</LaunchAction>
40+
<ProfileAction
41+
buildConfiguration = "Release"
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
savedToolIdentifier = ""
44+
useCustomWorkingDirectory = "NO"
45+
debugDocumentVersioning = "YES">
46+
</ProfileAction>
47+
<AnalyzeAction
48+
buildConfiguration = "Debug">
49+
</AnalyzeAction>
50+
<ArchiveAction
51+
buildConfiguration = "Release"
52+
revealArchiveInOrganizer = "YES">
53+
</ArchiveAction>
54+
</Scheme>

‎AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/xcshareddata/xcschemes/AWSAPIPluginGraphQLAuthDirectiveTestsWatch.xcscheme‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1640"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
</BuildAction>
10+
<TestAction
11+
buildConfiguration = "Debug"
12+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
13+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
14+
shouldUseLaunchSchemeArgsEnv = "YES"
15+
shouldAutocreateTestPlan = "YES">
16+
<Testables>
17+
<TestableReference
18+
skipped = "NO">
19+
<BuildableReference
20+
BuildableIdentifier = "primary"
21+
BlueprintIdentifier = "976837792E7BC117009CE583"
22+
BuildableName = "AWSAPIPluginGraphQLAuthDirectiveTestsWatch.xctest"
23+
BlueprintName = "AWSAPIPluginGraphQLAuthDirectiveTestsWatch"
24+
ReferencedContainer = "container:APIHostApp.xcodeproj">
25+
</BuildableReference>
26+
</TestableReference>
27+
</Testables>
28+
</TestAction>
29+
<LaunchAction
30+
buildConfiguration = "Debug"
31+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
32+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
33+
launchStyle = "0"
34+
useCustomWorkingDirectory = "NO"
35+
ignoresPersistentStateOnLaunch = "NO"
36+
debugDocumentVersioning = "YES"
37+
debugServiceExtension = "internal"
38+
allowLocationSimulation = "YES">
39+
</LaunchAction>
40+
<ProfileAction
41+
buildConfiguration = "Release"
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
savedToolIdentifier = ""
44+
useCustomWorkingDirectory = "NO"
45+
debugDocumentVersioning = "YES">
46+
</ProfileAction>
47+
<AnalyzeAction
48+
buildConfiguration = "Debug">
49+
</AnalyzeAction>
50+
<ArchiveAction
51+
buildConfiguration = "Release"
52+
revealArchiveInOrganizer = "YES">
53+
</ArchiveAction>
54+
</Scheme>

0 commit comments

Comments
 (0)