Merge "Disable test in presubmit" into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
21fe942d88
@@ -18,6 +18,7 @@ import org.junit.runner.RunWith;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@Ignore("Flaky")
|
||||
public class NetworkControllerDataTest extends NetworkControllerBaseTest {
|
||||
|
||||
@Test
|
||||
@@ -106,7 +107,6 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
|
||||
TelephonyIcons.QS_DATA_4G);
|
||||
}
|
||||
|
||||
@Ignore("Flaky")
|
||||
@Test
|
||||
public void testDataDisabledIcon() {
|
||||
setupNetworkController();
|
||||
|
||||
@@ -32,6 +32,7 @@ import com.android.settingslib.net.DataUsageController;
|
||||
import com.android.systemui.R;
|
||||
import com.android.systemui.statusbar.phone.SignalDrawable;
|
||||
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
@@ -47,6 +48,7 @@ import static org.mockito.Mockito.mock;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@Ignore("Flaky")
|
||||
public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user