diff --git a/src/python/pants/backend/helm/target_types.py b/src/python/pants/backend/helm/target_types.py index c5e4ea0743d..cb5e68ca881 100644 --- a/src/python/pants/backend/helm/target_types.py +++ b/src/python/pants/backend/helm/target_types.py @@ -279,8 +279,8 @@ class HelmUnitTestTestsGeneratorTarget(TargetFilesGenerator): HelmUnitTestTimeoutField, ) generated_target_cls = HelmUnitTestTestTarget - copied_fields = (*COMMON_TARGET_FIELDS, HelmUnitTestTimeoutField, HelmUnitTestStrictField) - moved_fields = (HelmUnitTestDependenciesField,) + copied_fields = (*COMMON_TARGET_FIELDS, HelmUnitTestStrictField) + moved_fields = (HelmUnitTestDependenciesField, HelmUnitTestTimeoutField) help = f"Generates a `{HelmUnitTestTestTarget.alias}` target per each file in the `{HelmUnitTestGeneratingSourcesField.alias}` field." diff --git a/src/python/pants/backend/java/target_types.py b/src/python/pants/backend/java/target_types.py index 9ee0d3d93e2..ddb2177dacd 100644 --- a/src/python/pants/backend/java/target_types.py +++ b/src/python/pants/backend/java/target_types.py @@ -80,13 +80,11 @@ class JavaTestsGeneratorSourcesField(JavaGeneratorSourcesField): class JunitTestsGeneratorTarget(TargetFilesGenerator): alias = "junit_tests" - core_fields = ( - *COMMON_TARGET_FIELDS, - JavaTestsGeneratorSourcesField, - ) + core_fields = (*COMMON_TARGET_FIELDS, JavaTestsGeneratorSourcesField, JunitTestTimeoutField) generated_target_cls = JunitTestTarget - copied_fields = (*COMMON_TARGET_FIELDS, JunitTestTimeoutField) + copied_fields = COMMON_TARGET_FIELDS moved_fields = ( + JunitTestTimeoutField, JvmDependenciesField, JvmJdkField, JvmProvidesTypesField, diff --git a/src/python/pants/backend/kotlin/target_types.py b/src/python/pants/backend/kotlin/target_types.py index 16044a2f24a..62d37e3d96d 100644 --- a/src/python/pants/backend/kotlin/target_types.py +++ b/src/python/pants/backend/kotlin/target_types.py @@ -156,12 +156,14 @@ class KotlinJunitTestsGeneratorTarget(TargetFilesGenerator): core_fields = ( *COMMON_TARGET_FIELDS, KotlinJunitTestsGeneratorSourcesField, + JunitTestTimeoutField, ) generated_target_cls = KotlinJunitTestTarget - copied_fields = (*COMMON_TARGET_FIELDS, JunitTestTimeoutField) + copied_fields = COMMON_TARGET_FIELDS moved_fields = ( KotlinJunitTestDependenciesField, KotlincConsumedPluginIdsField, + JunitTestTimeoutField, JvmResolveField, JvmJdkField, JvmProvidesTypesField, diff --git a/src/python/pants/backend/scala/target_types.py b/src/python/pants/backend/scala/target_types.py index 473bf6a0688..d57809488a0 100644 --- a/src/python/pants/backend/scala/target_types.py +++ b/src/python/pants/backend/scala/target_types.py @@ -152,12 +152,14 @@ class ScalatestTestsGeneratorTarget(TargetFilesGenerator): *COMMON_TARGET_FIELDS, ScalatestTestsGeneratorSourcesField, ScalatestTestsSourcesOverridesField, + ScalatestTestTimeoutField, ) generated_target_cls = ScalatestTestTarget - copied_fields = (*COMMON_TARGET_FIELDS, ScalatestTestTimeoutField) + copied_fields = COMMON_TARGET_FIELDS moved_fields = ( ScalaDependenciesField, ScalaConsumedPluginNamesField, + ScalatestTestTimeoutField, JvmJdkField, JvmProvidesTypesField, JvmResolveField,