Commit 73a4a5a

committed

Fix testVersionHandlerActivation

1 parent c289496 commit 73a4a5aCopy full SHA for 73a4a5a

File tree

+12

-3

lines changed

.github/workflows
- test.yaml
source
- VersionHandlerImpl/test/activation/Assets/PlayServicesResolver/Editor
  - TestEnabledCallback.cs
- VersionHandler/src
  - VersionHandler.cs

+12

-3

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,14 +105,13 @@ jobs:`
`105`	`105`	`timeout-minutes: 60`
`106`	`106`	`run: \|`
`107`	`107`	`# DISABLE: NUnit test is currently broken from Unity 2019`
`108`		`- # DISABLE: testVersionHandlerActivationBatchMode is causing timeout.`
`109`	`108`	`./gradlew test -q \`
`110`	`109`	`-PINTERACTIVE_MODE_TESTS_ENABLED=0 \`
`111`	`110`	`-PINCLUDE_TEST_TYPES="${{ needs.check_and_prepare.outputs.include_test_types }}" \`
`112`	`111`	`-PEXCLUDE_TEST_TYPES="NUnit,${{ needs.check_and_prepare.outputs.exclude_test_types }}" \`
`113`	`112`	`-PINCLUDE_TEST_MODULES="${{ needs.check_and_prepare.outputs.include_test_modules }}" \`
`114`	`113`	`-PEXCLUDE_TEST_MODULES="${{ needs.check_and_prepare.outputs.exclude_test_modules }}" \`
`115`		`- -PEXCLUDE_TESTS="testVersionHandlerActivationBatchMode,${{ needs.check_and_prepare.outputs.exclude_tests }}"`
	`114`	`+ -PEXCLUDE_TESTS="${{ needs.check_and_prepare.outputs.exclude_tests }}"`
`116`	`115`
`117`	`116`	`- name: Print test log`
`118`	`117`	`if: always()`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,12 @@ static VersionHandler() {`
`118`	`118`	`} else {`
`119`	`119`	`EditorApplication.update -= BootStrap;`
`120`	`120`	`EditorApplication.update += BootStrap;`
	`121`	`+ // A workaround to make sure bootstrap continues if Unity reloads assemblies`
	`122`	`+ // during bootstrapping. The issue only observed in Unity 2019 and 2020`
	`123`	`+ float unityVersion = GetUnityVersionMajorMinor();`
	`124`	`+ if (unityVersion < 2021.0f && unityVersion >= 2019.0f) {`
	`125`	`+ var type = BootStrappedImpl;`
	`126`	`+ }`
`121`	`127`	`}`
`122`	`128`	`}`
`123`	`129`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,11 @@ private static Dictionary<string, Type> EntryPoints {`
`42`	`42`	`{`
`43`	`43`	`"IOS Resolver",`
`44`	`44`	`Google.VersionHandler.FindClass("Google.IOSResolver", "Google.IOSResolver")`
`45`		`- }`
	`45`	`+ },`
	`46`	`+ {`
	`47`	`+ "Package Manager Resolver",`
	`48`	`+ Google.VersionHandler.FindClass("Google.PackageManagerResolver", "Google.PackageManagerResolver")`
	`49`	`+ }`
`46`	`50`	`};`
`47`	`51`	`}`
`48`	`52`	`}`

Comments

(0)