diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/ci/test/kind.yml index dcd9512a4b0a..5f5b57cabe43 100644 --- a/taskcluster/ci/test/kind.yml +++ b/taskcluster/ci/test/kind.yml @@ -12,14 +12,14 @@ kind-dependencies: - toolchain transforms: - - gecko_taskgraph.transforms.tests:transforms + - gecko_taskgraph.transforms.test:transforms - gecko_taskgraph.transforms.job:transforms - gecko_taskgraph.transforms.task:transforms # Each stanza in a file pointed to by 'jobs-from' describes a particular test # suite or sub-suite. These are processed through the transformations described # above to produce a bunch of tasks. See the schema in -# `taskcluster/gecko_taskgraph/transforms/tests.py` for a description of the fields +# `taskcluster/gecko_taskgraph/transforms/test/__init__.py` for a description of the fields # used in these files. # Adding a new test type or running tests on a new platform? Be sure to review diff --git a/taskcluster/docs/attributes.rst b/taskcluster/docs/attributes.rst index 476336e99b72..ffcc10156170 100644 --- a/taskcluster/docs/attributes.rst +++ b/taskcluster/docs/attributes.rst @@ -144,7 +144,7 @@ unittest_variant The configuration variant the test suite is running with. If set, this usually means the tests are running with a special pref enabled. These are defined in -``taskgraph.transforms.tests.TEST_VARIANTS``. +``taskgraph.transforms.test.TEST_VARIANTS``. talos_try_name ============== diff --git a/taskcluster/docs/how-tos.rst b/taskcluster/docs/how-tos.rst index 8a7e5c39d9de..a9952eae8504 100644 --- a/taskcluster/docs/how-tos.rst +++ b/taskcluster/docs/how-tos.rst @@ -86,7 +86,7 @@ platform. For example: default: 8 The full set of available properties is in -``taskcluster/gecko_taskgraph/transforms/tests.py``. Some other +``taskcluster/gecko_taskgraph/transforms/test/__init__.py``. Some other commonly-modified properties are ``max-run-time`` (useful if tests are being killed for exceeding maxRunTime) and ``treeherder-symbol``. @@ -104,7 +104,7 @@ for that suite, and which kind it fits into (consult :doc:`kinds`). Add a new stanza to ``taskcluster/ci//tests.yml``, copying from the other stanzas in that file. The meanings should be clear, but authoritative documentation is in -``taskcluster/gecko_taskgraph/transforms/tests.py`` should you need +``taskcluster/gecko_taskgraph/transforms/test/__init__.py`` should you need it. The stanza name is the name by which the test will be referenced in try syntax. diff --git a/taskcluster/docs/kinds/test.rst b/taskcluster/docs/kinds/test.rst index 56a71297056d..ee7228df1c20 100644 --- a/taskcluster/docs/kinds/test.rst +++ b/taskcluster/docs/kinds/test.rst @@ -48,7 +48,7 @@ See this file for an up to date list of active variants and the pref(s) they set. Each variant must conform to the -:py:data:`~gecko_taskgraph.transforms.tests.variant_description_schema`: +:py:data:`~gecko_taskgraph.transforms.test.variant_description_schema`: * **description** (required) - A description explaining what the variant is for * **suffix** (required) - A suffix to apply to the task label and treeherder symbol @@ -123,11 +123,11 @@ that make up a ``setting``: Test ``settings`` are available in the ``task.extra.test-setting`` object in all test tasks. They are defined by the -:py:func:`~gecko_taskgraph.transforms.tests.set_test_setting` transform +:py:func:`~gecko_taskgraph.transforms.test.set_test_setting` transform function. The full schema is defined in the -:py:data:`~gecko_taskgraph.transforms.tests.test_setting_description_schema`. +:py:data:`~gecko_taskgraph.transforms.test.test_setting_description_schema`. Setting Hash ~~~~~~~~~~~~ diff --git a/taskcluster/docs/transforms.rst b/taskcluster/docs/transforms.rst index 70f993ecf8c8..1deb1bdf31bf 100644 --- a/taskcluster/docs/transforms.rst +++ b/taskcluster/docs/transforms.rst @@ -106,8 +106,9 @@ invocation on different platforms leaves a lot of specific behavior in the test description, divided by ``by-test-platform``. Test descriptions are validated to conform to the schema in -``taskcluster/gecko_taskgraph/transforms/tests.py``. This schema is extensively -documented and is a the primary reference for anyone modifying tests. +``taskcluster/gecko_taskgraph/transforms/test/__init__.py``. This schema is +extensively documented and is a the primary reference for anyone modifying +tests. The output of ``tests.py`` is a task description. Test dependencies are produced in the form of a dictionary mapping dependency name to task label. diff --git a/taskcluster/gecko_taskgraph/test/python.ini b/taskcluster/gecko_taskgraph/test/python.ini index d135c17cbac9..cd966380fedf 100644 --- a/taskcluster/gecko_taskgraph/test/python.ini +++ b/taskcluster/gecko_taskgraph/test/python.ini @@ -17,7 +17,7 @@ subsuite = taskgraph [test_taskcluster_yml.py] [test_transforms_base.py] [test_transforms_job.py] -[test_transforms_tests.py] +[test_transforms_test.py] [test_try_option_syntax.py] [test_util_attributes.py] [test_util_backstop.py] diff --git a/taskcluster/gecko_taskgraph/test/test_transforms_tests.py b/taskcluster/gecko_taskgraph/test/test_transforms_test.py similarity index 99% rename from taskcluster/gecko_taskgraph/test/test_transforms_tests.py rename to taskcluster/gecko_taskgraph/test/test_transforms_test.py index 93a1a8056d92..b8b41e91c4be 100644 --- a/taskcluster/gecko_taskgraph/test/test_transforms_tests.py +++ b/taskcluster/gecko_taskgraph/test/test_transforms_test.py @@ -11,7 +11,7 @@ from functools import partial import mozunit import pytest -from gecko_taskgraph.transforms import tests as test_transforms +from gecko_taskgraph.transforms import test as test_transforms @pytest.fixture diff --git a/taskcluster/gecko_taskgraph/transforms/job/mozharness_test.py b/taskcluster/gecko_taskgraph/transforms/job/mozharness_test.py index 996bb0992666..919d79c673d2 100644 --- a/taskcluster/gecko_taskgraph/transforms/job/mozharness_test.py +++ b/taskcluster/gecko_taskgraph/transforms/job/mozharness_test.py @@ -16,7 +16,7 @@ from gecko_taskgraph.transforms.job import ( ) from gecko_taskgraph.util.schema import Schema from gecko_taskgraph.util.taskcluster import get_artifact_path -from gecko_taskgraph.transforms.tests import test_description_schema, normpath +from gecko_taskgraph.transforms.test import test_description_schema, normpath from gecko_taskgraph.transforms.job.common import support_vcs_checkout VARIANTS = [ diff --git a/taskcluster/gecko_taskgraph/transforms/tests.py b/taskcluster/gecko_taskgraph/transforms/test/__init__.py similarity index 99% rename from taskcluster/gecko_taskgraph/transforms/tests.py rename to taskcluster/gecko_taskgraph/transforms/test/__init__.py index ed259450388d..756db7d518e1 100644 --- a/taskcluster/gecko_taskgraph/transforms/tests.py +++ b/taskcluster/gecko_taskgraph/transforms/test/__init__.py @@ -654,7 +654,7 @@ def resolve_keys(config, tasks): @transforms.add def setup_raptor(config, tasks): """Add options that are specific to raptor jobs (identified by suite=raptor)""" - from gecko_taskgraph.transforms.raptor import transforms as raptor_transforms + from gecko_taskgraph.transforms.test.raptor import transforms as raptor_transforms for task in tasks: if task["suite"] != "raptor": diff --git a/taskcluster/gecko_taskgraph/transforms/raptor.py b/taskcluster/gecko_taskgraph/transforms/test/raptor.py similarity index 99% rename from taskcluster/gecko_taskgraph/transforms/raptor.py rename to taskcluster/gecko_taskgraph/transforms/test/raptor.py index 2440ba6a15e8..6d82dfe7ec91 100644 --- a/taskcluster/gecko_taskgraph/transforms/raptor.py +++ b/taskcluster/gecko_taskgraph/transforms/test/raptor.py @@ -12,7 +12,7 @@ from voluptuous import ( ) from gecko_taskgraph.transforms.base import TransformSequence -from gecko_taskgraph.transforms.tests import test_description_schema +from gecko_taskgraph.transforms.test import test_description_schema from gecko_taskgraph.util.schema import optionally_keyed_by, resolve_keyed_by, Schema from gecko_taskgraph.util.treeherder import split_symbol, join_symbol diff --git a/tools/code-coverage/docs/index.rst b/tools/code-coverage/docs/index.rst index e4e1d73e1bf1..36333b482924 100644 --- a/tools/code-coverage/docs/index.rst +++ b/tools/code-coverage/docs/index.rst @@ -153,7 +153,7 @@ format for analysis. Anytime a code coverage run generates \*.gcda and permanently fail when it is running on a build that is instrumented with GCOV. To debug these issues without overloading ActiveData with garbage coverage data, open the file -`taskcluster/gecko_taskgraph/transforms/tests.py `__ +`taskcluster/gecko_taskgraph/transforms/test/__init__.py `__ and add the following line, .. code:: python diff --git a/tools/lint/rejected-words.yml b/tools/lint/rejected-words.yml index 3482c4d6efb8..8425cc7bc618 100644 --- a/tools/lint/rejected-words.yml +++ b/tools/lint/rejected-words.yml @@ -308,7 +308,7 @@ avoid-blacklist-and-whitelist: - taskcluster/ci/docker-image/kind.yml - taskcluster/gecko_taskgraph/actions/create_interactive.py - taskcluster/gecko_taskgraph/target_tasks.py - - taskcluster/gecko_taskgraph/transforms/tests.py + - taskcluster/gecko_taskgraph/transforms/test/__init__.py - taskcluster/gecko_taskgraph/try_option_syntax.py - taskcluster/gecko_taskgraph/util/schema.py - taskcluster/test/test_mach_try_auto.py