commit 032b6ec9fdbededd1cb4b6a3a3f982a818062e31
author Jason Parks <jparks@google.com> Thu Sep 03 22:03:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 22:03:14 2015 +0000
tree 74257c9c9599ccfe389ebd1da717c9f2b165b4f4
parent c35575f79aece12a03ed5927ee87c0928a45dba8
parent 0daa2aee8253301940c8d160f51c3db88e794d0a

am 0daa2aee: Fix the flakiness of this test by waiting.

* commit '0daa2aee8253301940c8d160f51c3db88e794d0a':
  Fix the flakiness of this test by waiting.

tests/tests/opengl/src/android/opengl/cts/ProgramTest.java

diff --git a/tests/tests/opengl/src/android/opengl/cts/ProgramTest.java b/tests/tests/opengl/src/android/opengl/cts/ProgramTest.java
index 85009d2..dab2ef1 100644
--- a/tests/tests/opengl/src/android/opengl/cts/ProgramTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/ProgramTest.java
@@ -32,7 +32,9 @@
         intent.putExtra(OpenGLES20NativeActivityOne.EXTRA_VIEW_TYPE, viewType);
         intent.putExtra(OpenGLES20NativeActivityOne.EXTRA_VIEW_INDEX, viewIndex);
         setActivityIntent(intent);
-        return getActivity();
+        OpenGLES20ActivityOne activity = getActivity();
+        assertTrue(activity.waitForFrameDrawn());
+        return activity;
     }
 
     public void test_glAttachShader_program() throws Throwable {