Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d381f47 authored by Sam Dubey's avatar Sam Dubey Committed by Automerger Merge Worker
Browse files

Merge "Exclude flaky annoatated tests" into tm-qpr-dev am: bc5c8950 am: d1d32615 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20979114



Change-Id: I9d80b69aeaa97976090903f4daff9a12e3aca85b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ab4a7f6 d1d32615

packages/SystemUI/TEST_MAPPING

+15 −6
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
        },

        {

            "exclude-annotation": "android.platform.test.annotations.Postsubmit"

        },

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        }

      ]

    }
@@ -73,16 +76,16 @@ 
  // Curious where your @Scenario tests will run?

  //

  // @Ignore: nowhere

  // @Staging or @FlakyTest: in staged-postsubmit, but not postsubmit or

  // @FlakyTest: in staged-postsubmit, but not blocking postsubmit or

  // presubmit

  // @Postsubmit: in postsubmit and staged-postsubmit, but not presubmit

  // none of the above: in presubmit, postsubmit, and staged-postsubmit

  //

  // Therefore, please annotate new tests with @Staging, then with @Postsubmit

  // once they're ready for postsubmit, then with neither once they're ready

  // for presubmit.

  // Ideally, please annotate new tests with @FlakyTest, then with @Postsubmit

  // once they're ready for postsubmit as they will immediately block go/android-platinum,

  // then with neither once they're ready for presubmit.

  //

  // If you don't use @Staging or @Postsubmit, your new test will immediately

  // If you don't use @Postsubmit, your new test will immediately

  // block presubmit, which is probably not what you want!

  "sysui-platinum-postsubmit": [

    {
@@ -99,6 +102,9 @@ 
        },

        {

            "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        }

      ]

    }
@@ -131,6 +137,9 @@ 
        },

        {

            "include-filter": "android.platform.test.scenario.sysui"

        },

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        }

      ]

    }