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

Commit a25839f1 authored by Sarp Misoglu's avatar Sarp Misoglu Committed by Android (Google) Code Review
Browse files

Merge changes I1a3e4a4a,Ie8ff85d8 

* changes:
  Add B&R on-device unit tests to presubmits
  Fix broken test by increasing Thread#join timeout
parents 17b64962 2d739498

services/backup/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksMockingServicesTests",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "CtsBackupTestCases"

    }

services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class UserBackupManagerServiceTest { 
    private static final String TEST_PACKAGE = "package1";

    private static final String[] TEST_PACKAGES = new String[] { TEST_PACKAGE };

    private static final String TEST_TRANSPORT = "transport";

    private static final int WORKER_THREAD_TIMEOUT_MILLISECONDS = 1;

    private static final int WORKER_THREAD_TIMEOUT_MILLISECONDS = 100;

    @UserIdInt private static final int USER_ID = 0;



    @Mock IBackupManagerMonitor mBackupManagerMonitor;