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

Commit cc940f42 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Mark flaky tests as @Ignore. 

This is to make sure the behavior is consistent locally, on apct,
and on treehugger. Also marking a couple of tests as @FlakyTest.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests
Bug: 29579544
Change-Id: I75b4d12a0c84d5629cf4b6646ea0e5a35bd2bf71
parent 86efdde1

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -185,6 +185,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
    }

    }





    @FlakyTest

    @FlakyTest

    @Ignore

    @Test

    @Test

    @MediumTest

    @MediumTest

    public void testMOCallPendingHangUp() {

    public void testMOCallPendingHangUp() {
@@ -295,6 +296,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
    }

    }





    @FlakyTest

    @FlakyTest

    @Ignore

    @Test

    @Test

    @MediumTest

    @MediumTest

    public void testMOCallSwitchHangupForeGround() {

    public void testMOCallSwitchHangupForeGround() {

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -513,6 +513,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
     * received when obj is created and that are received on phone type switch

     * received when obj is created and that are received on phone type switch

     */

     */

    @FlakyTest

    @FlakyTest

    @Ignore

    @Test

    @Test

    @SmallTest

    @SmallTest

    public void testHandleInitialMessages() {

    public void testHandleInitialMessages() {

tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -428,6 +428,7 @@ public class PhoneNumberUtilsTest { 




    // To run this test, the device has to be registered with network

    // To run this test, the device has to be registered with network

    @FlakyTest

    @FlakyTest

    @Ignore

    public void testCheckAndProcessPlusCode() {

    public void testCheckAndProcessPlusCode() {

        assertEquals("0118475797000",

        assertEquals("0118475797000",

                PhoneNumberUtils.cdmaCheckAndProcessPlusCode("+8475797000"));

                PhoneNumberUtils.cdmaCheckAndProcessPlusCode("+8475797000"));

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ import com.android.internal.telephony.uicc.IccCardApplicationStatus; 




import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.mockito.ArgumentCaptor;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.Mock;
@@ -239,6 +240,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
    }

    }





    @FlakyTest

    @FlakyTest

    @Ignore

    @Test

    @Test

    @MediumTest

    @MediumTest

    public void testSpnUpdateShowPlmnOnly() {

    public void testSpnUpdateShowPlmnOnly() {

tests/telephonytests/src/com/android/internal/telephony/Sms7BitEncodingTranslatorTest.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -16,21 +16,23 @@ 




package com.android.internal.telephony;

package com.android.internal.telephony;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.doReturn;



import android.support.test.filters.FlakyTest;

import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.mockito.Mock;

import org.mockito.Mock;





import java.io.UnsupportedEncodingException;

import java.io.UnsupportedEncodingException;





import static org.junit.Assert.assertEquals;

@Ignore

import static org.junit.Assert.fail;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.doReturn;



public class Sms7BitEncodingTranslatorTest extends TelephonyTest {

public class Sms7BitEncodingTranslatorTest extends TelephonyTest {





    @Mock

    @Mock