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

Commit 826794bd authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Switch "postsubmit" to "presubmit" after soak" into main

parents 769d6612 bb8de1ac

core/java/android/app/time/TEST_MAPPING

+9 −9
Original line number Diff line number Diff line
@@ -7,12 +7,20 @@ 
          "include-filter": "android.app."

        }

      ]

    },

    {

      "name": "CtsTimeTestCases",

      "options": [

        {

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

        }

      ]

    }

  ],

  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    {

      "name": "FrameworksServicesTests",

      "name": "FrameworksTimeServicesTests",

      "options": [

        {

          "include-filter": "com.android.server.timezonedetector."
@@ -21,14 +29,6 @@ 
          "include-filter": "com.android.server.timedetector."

        }

      ]

    },

    {

      "name": "CtsTimeTestCases",

      "options": [

        {

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

        }

      ]

    }

  ]

}

core/java/android/app/timedetector/TEST_MAPPING

+9 −9
Original line number Diff line number Diff line
@@ -7,23 +7,23 @@ 
          "include-filter": "android.app."

        }

      ]

    }

  ],

  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    },

    {

      "name": "FrameworksServicesTests",

      "name": "CtsTimeTestCases",

      "options": [

        {

          "include-filter": "com.android.server.timedetector."

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

        }

      ]

    },

    }

  ],

  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    {

      "name": "CtsTimeTestCases",

      "name": "FrameworksTimeServicesTests",

      "options": [

        {

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

          "include-filter": "com.android.server.timedetector."

        }

      ]

    }

core/java/android/app/timezonedetector/TEST_MAPPING

+9 −9
Original line number Diff line number Diff line
@@ -7,23 +7,23 @@ 
          "include-filter": "android.app."

        }

      ]

    }

  ],

  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    },

    {

      "name": "FrameworksServicesTests",

      "name": "CtsTimeTestCases",

      "options": [

        {

          "include-filter": "com.android.server.timezonedetector."

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

        }

      ]

    },

    }

  ],

  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    {

      "name": "CtsTimeTestCases",

      "name": "FrameworksTimeServicesTests",

      "options": [

        {

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

          "include-filter": "com.android.server.timezonedetector."

        }

      ]

    }