WifiDiagnostics: disable some size-sensitive tests

Several of the WifiDiagnostics tests assume that the
ring-buffer sizes differ between normal and verbose mode.

This assumption is normally true. However, at this
stage of dogfooding, we use the larger ringbuffers in
both modes.

Disable the tests that suffer from the (temporarily)
invalid assumption.

Bug: 36811396
Bug: 37286540
Test: tests/wifitests/runtests.sh (on bullhead)
Change-Id: I149a3bfbcec8b0fd11bd569862265764d7fbb120

1 files changed, 5 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 41453d6a7..b31d07b1d 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
@@ -236,7 +236,7 @@ public class WifiDiagnosticsTest {
     /**
      * Verifies that we discard extraneous ring-buffer data.
      */
-    @Test
+    // TODO(b/36811399): re-enabled this @Test
     public void loggerDiscardsExtraneousData() throws Exception {
         final boolean verbosityToggle = false;
         mWifiDiagnostics.startLogging(verbosityToggle);
@@ -594,7 +594,7 @@ public class WifiDiagnosticsTest {
     }
 
     /** Verifies that the default size of our ring buffers is small. */
-    @Test
+    // TODO(b/36811399): re-enable this @Test
     public void ringBufferSizeIsSmallByDefault() throws Exception {
         final boolean verbosityToggle = false;
         mWifiDiagnostics.startLogging(verbosityToggle);
@@ -605,7 +605,7 @@ public class WifiDiagnosticsTest {
     }
 
     /** Verifies that we use small ring buffers by default, on userdebug builds. */
-    @Test
+    // TODO(b/36811399): re-enable this @Test
     public void ringBufferSizeIsSmallByDefaultOnUserdebugBuilds() throws Exception {
         final boolean verbosityToggle = false;
         when(mBuildProperties.isUserdebugBuild()).thenReturn(true);
@@ -619,7 +619,7 @@ public class WifiDiagnosticsTest {
     }
 
     /** Verifies that we use small ring buffers by default, on eng builds. */
-    @Test
+    // TODO(b/36811399): re-enable this @Test
     public void ringBufferSizeIsSmallByDefaultOnEngBuilds() throws Exception {
         final boolean verbosityToggle = false;
         when(mBuildProperties.isEngBuild()).thenReturn(true);
@@ -655,7 +655,7 @@ public class WifiDiagnosticsTest {
     }
 
     /** Verifies that we use small ring buffers when switched from verbose to normal mode. */
-    @Test
+    // TODO(b/36811399): re-enabled this @Test
     public void startLoggingShrinksRingBuffersIfNeeded() throws Exception {
         mWifiDiagnostics.startLogging(true  /* verbose enabled */);
         mWifiDiagnostics.onRingBufferData(