commit 0daa2aee8253301940c8d160f51c3db88e794d0a
author Jason Parks <jparks@google.com> Tue Dec 02 14:29:39 2014 -0600
committer Jason Parks <jparks@google.com> Tue Dec 02 14:31:06 2014 -0600
tree fda697552ccfc32c8f6d762775ff9b3d340c394c
parent a2f93c757eba9ceb1035b2498fb0df21e7184136

Fix the flakiness of this test by waiting.

Bug: 18501293
Change-Id: Iee774c67faa2334accf976ec06121321813c652d

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 {