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

Commit 4e068b34 authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Add @FlakyTest annotation to @Postsubmit tests"

parents cfd9d7fd c7dbd2c2

tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ include $(CLEAR_VARS) 
LOCAL_STATIC_JAVA_LIBRARIES := \

        android-ex-camera2 \

        android-support-v4 \

        android-support-test \

        guava \

        mockito-target \

        platform-test-annotations \

tests/src/com/android/server/telecom/tests/CallLogManagerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.UserManager; 
import android.platform.test.annotations.Postsubmit;

import android.provider.CallLog;

import android.provider.CallLog.Calls;

import android.support.test.filters.FlakyTest;

import android.telecom.DisconnectCause;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;
@@ -424,6 +425,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
    }



    @MediumTest

    @FlakyTest

    @Postsubmit

    public void testLogCallDirectionOutgoingWithMultiUserCapability() {

        when(mMockPhoneAccountRegistrar.getPhoneAccountUnchecked(any(PhoneAccountHandle.class)))
@@ -518,6 +520,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
    }



    @MediumTest

    @FlakyTest

    @Postsubmit

    public void testLogCallDirectionOutgoingFromManagedProfile() {

        when(mMockPhoneAccountRegistrar.getPhoneAccountUnchecked(any(PhoneAccountHandle.class)))