summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2018-02-28 22:35:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-28 22:35:13 +0000
commit0ed59e08c08b7bba3360b639d57a2ed9a0f42434 (patch)
treef3b5d681f2ddcfbe6531887fb664d6bce7425289
parentbdd723462e7124cc262e7f0e0f9e99bbbc3a66d2 (diff)
parentb4bdaf5362a574dcc90e1618700e203c8a6e4a80 (diff)
Wifi: Mark disabled tests with @Ignore am: ac0845af4a
am: b4bdaf5362 Change-Id: Ic4b0941ba4a24cffeab4ef9b0bb5b279befcf71b
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
index 6b93e0524..30d4d8f34 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
@@ -37,6 +37,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import com.android.internal.R;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -246,7 +247,8 @@ public class WifiDiagnosticsTest {
/**
* Verifies that we discard extraneous ring-buffer data.
*/
- // TODO(b/36811399): re-enabled this @Test
+ @Ignore("TODO(b/36811399): re-enabled this @Test")
+ @Test
public void loggerDiscardsExtraneousData() throws Exception {
final boolean verbosityToggle = false;
setBuildPropertiesToEnableRingBuffers();
@@ -617,7 +619,8 @@ public class WifiDiagnosticsTest {
}
/** Verifies that the default size of our ring buffers is small. */
- // TODO(b/36811399): re-enable this @Test
+ @Ignore("TODO(b/36811399): re-enable this @Test")
+ @Test
public void ringBufferSizeIsSmallByDefault() throws Exception {
final boolean verbosityToggle = false;
mWifiDiagnostics.startLogging(verbosityToggle);
@@ -628,7 +631,8 @@ public class WifiDiagnosticsTest {
}
/** Verifies that we use small ring buffers by default, on userdebug builds. */
- // TODO(b/36811399): re-enable this @Test
+ @Ignore("TODO(b/36811399): re-enable this @Test")
+ @Test
public void ringBufferSizeIsSmallByDefaultOnUserdebugBuilds() throws Exception {
final boolean verbosityToggle = false;
when(mBuildProperties.isUserdebugBuild()).thenReturn(true);
@@ -642,7 +646,8 @@ public class WifiDiagnosticsTest {
}
/** Verifies that we use small ring buffers by default, on eng builds. */
- // TODO(b/36811399): re-enable this @Test
+ @Ignore("TODO(b/36811399): re-enable this @Test")
+ @Test
public void ringBufferSizeIsSmallByDefaultOnEngBuilds() throws Exception {
final boolean verbosityToggle = false;
when(mBuildProperties.isEngBuild()).thenReturn(true);
@@ -682,7 +687,8 @@ public class WifiDiagnosticsTest {
}
/** Verifies that we use small ring buffers when switched from verbose to normal mode. */
- // TODO(b/36811399): re-enabled this @Test
+ @Ignore("TODO(b/36811399): re-enabled this @Test")
+ @Test
public void startLoggingShrinksRingBuffersIfNeeded() throws Exception {
setBuildPropertiesToEnableRingBuffers();