From c97d8b7464f0c60165ac9abb6b35323583fad2b5 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Mon, 22 Aug 2016 08:50:43 -0700
Subject: [PATCH] DO NOT MERGE: Use @Ignore to explicitly disable a @Test
 method.

BUG: 30839080
BUG: 31007021

(cherry picked from commit fc7d7a359f800d7320d29055ef3b4b75157aaf13)

(cherry picked from commit 2026ca147b6460807b19c997600315806ecb3197)

Change-Id: I45efc93b40e526467c97d0735289db1404ccd22d
---
 .../src/com/android/server/net/NetworkStatsServiceTest.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java
index 9176675c4dd49..a810f440d002e 100644
--- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java
@@ -101,6 +101,7 @@ import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -372,7 +373,8 @@ public class NetworkStatsServiceTest {
     }
 
     // TODO: simulate reboot to test bucket resize
-    // @Test
+    @Test
+    @Ignore
     public void testStatsBucketResize() throws Exception {
         NetworkStatsHistory history = null;