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

Commit ede3344e authored Mar 02, 2018 by Wale Ogunwale Committed by Android (Google) Code Review Mar 02, 2018

Merge "Mark wm tests as flaky"

parents c42546ed 4f0f348a

services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import org.junit.Test;
		import org.junit.runner.RunWith;

		import android.platform.test.annotations.Presubmit;
		import android.support.test.filters.FlakyTest;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;

		@@ -52,6 +53,7 @@ import static org.mockito.Mockito.verify;
		* atest FrameworksServicesTests:com.android.server.wm.WindowStateTests
		*/
		@SmallTest
		@Flaky(bugId = 74078662)
		@Presubmit
		@RunWith(AndroidJUnit4.class)
		public class WindowStateTests extends WindowTestsBase {

services/tests/servicestests/src/com/android/server/wm/WindowTokenTests.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import org.junit.Test;
		import org.junit.runner.RunWith;

		import android.platform.test.annotations.Presubmit;
		import android.support.test.filters.FlakyTest;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;

		@@ -40,6 +41,7 @@ import static org.mockito.Mockito.mock;
		* bit FrameworksServicesTests:com.android.server.wm.WindowTokenTests
		*/
		@SmallTest
		@Flaky(bugId = 74078662)
		@Presubmit
		@RunWith(AndroidJUnit4.class)
		public class WindowTokenTests extends WindowTestsBase {

services/tests/servicestests/src/com/android/server/wm/WindowTracingTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.content.Context;
		import android.platform.test.annotations.Presubmit;
		import android.support.test.InstrumentationRegistry;
		import android.support.test.filters.SmallTest;
		import android.support.test.filters.FlakyTest;
		import android.support.test.runner.AndroidJUnit4;
		import android.util.proto.ProtoOutputStream;

		@@ -56,6 +57,7 @@ import java.nio.charset.StandardCharsets;
		* bit FrameworksServicesTests:com.android.server.wm.WindowTracingTest
		*/
		@SmallTest
		@Flaky(bugId = 74078662)
		@Presubmit
		@RunWith(AndroidJUnit4.class)
		public class WindowTracingTest extends WindowTestsBase {

services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY;

		import android.platform.test.annotations.Presubmit;
		import android.support.test.filters.SmallTest;
		import android.support.test.filters.FlakyTest;
		import android.support.test.runner.AndroidJUnit4;
		import android.view.SurfaceControl;
		import android.view.SurfaceSession;
		@@ -53,6 +54,7 @@ import java.util.LinkedList;
		* bit FrameworksServicesTests:com.android.server.wm.ZOrderingTests
		*/
		@SmallTest
		@Flaky(bugId = 74078662)
		@Presubmit
		@RunWith(AndroidJUnit4.class)
		public class ZOrderingTests extends WindowTestsBase {

services/tests/servicestests/src/com/android/server/wm/utils/RotationCacheTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertThat;

		import android.platform.test.annotations.Presubmit;
		import android.support.test.filters.FlakyTest;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;
		import android.util.Pair;
		@@ -37,6 +38,7 @@ import org.junit.runner.RunWith;

		@RunWith(AndroidJUnit4.class)
		@SmallTest
		@Flaky(bugId = 74078662)
		@Presubmit
		public class RotationCacheTest {