update WebGL to initial release 1.0.0

client/site_tests/graphics_WebGLConformance/graphics_WebGLConformance.py

Index: client/site_tests/graphics_WebGLConformance/graphics_WebGLConformance.py
diff --git a/client/site_tests/graphics_WebGLConformance/graphics_WebGLConformance.py b/client/site_tests/graphics_WebGLConformance/graphics_WebGLConformance.py
index 53c9ad6db138ff2090904c3cf08355857529cfee..9face505f84d3cb44e7a2bbee09eb7d38164961f 100644
--- a/client/site_tests/graphics_WebGLConformance/graphics_WebGLConformance.py
+++ b/client/site_tests/graphics_WebGLConformance/graphics_WebGLConformance.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import logging, os, shutil
+import logging, os, shutil, urllib
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.cros import cros_ui, cros_ui_test, httpd
@@ -10,6 +10,31 @@ from autotest_lib.client.cros import cros_ui, cros_ui_test, httpd
 class graphics_WebGLConformance(cros_ui_test.UITest):
     version = 1
 
+    # TODO(ihf) not all tests are passing now, maintain this
+    # list was assembled on mario but should be a superset
+    # of all failing configurations
+    waived_tests = {
+        'conformance/premultiplyalpha-test.html' : 8,
+        'conformance/tex-image-and-sub-image-2d-with-array-buffer-view.html' : 192,
+        'conformance/tex-image-with-format-and-type.html' : 12,
+        'conformance/texture-npot.html' : 12,
+        'conformance/glsl-conformance.html' : 1,
+        'conformance/tex-image-and-sub-image-2d-with-image.html' : 8,
+        'conformance/copy-tex-image-and-sub-image-2d.html' : 34,
+        'conformance/gl-clear.html' : 4,
+        'conformance/more/functions/readPixelsBadArgs.html' : 1,
+        'conformance/more/conformance/webGLArrays.html' : 1,
+        'conformance/gl-teximage.html' : 46,
+        'conformance/texture-active-bind.html' : 4,
+        'conformance/read-pixels-test.html' : 3,
+        'conformance/gl-object-get-calls.html' : 2,
+        'conformance/point-size.html' : 1,
+        'conformance/texture-formats-test.html' : 4,
+        'conformance/texture-complete.html' : 1,
+        'conformance/tex-image-and-sub-image-2d-with-video.html' : 8,
+        'conformance/context-lost-restored.html' : 2,
+        'conformance/tex-image-and-sub-image-2d-with-image-data.html' : 16
+      }
 
     def initialize(self, creds='$default'):
         self._test_url = 'http://localhost:8000/webgl-conformance-tests.html'
@@ -17,40 +42,85 @@ class graphics_WebGLConformance(cros_ui_test.UITest):
         self._testServer.run()
         cros_ui_test.UITest.initialize(self, creds)
 
-
-    def setup(self, tarball='webgl-tests-0.0.1.tar.bz2'):
+    def setup(self, tarball='webgl-conformance-1.0.0.tar.bz2'):
         shutil.rmtree(self.srcdir, ignore_errors=True)
-
-        dst_path = os.path.join(self.bindir, 'WebGL')
         tarball_path = os.path.join(self.bindir, tarball)
-        if not os.path.exists(dst_path):
+        if not os.path.exists(self.srcdir):
             if not os.path.exists(tarball_path):
                 utils.get_file(
                     'http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/' + tarball,
                      tarball_path)
-            utils.extract_tarball_to_dir(tarball_path, dst_path)
-
-        shutil.copytree(os.path.join(self.bindir, 'WebGL'), self.srcdir)
+            utils.extract_tarball_to_dir(tarball_path, self.srcdir)
         os.chdir(self.srcdir)
-        utils.system('patch -p1 < ../r11002.patch')
-
+        utils.system('patch -p1 < ../webgl-conformance-1.0.0.patch')
 
     def cleanup(self):
         self._testServer.stop()
         cros_ui_test.UITest.cleanup(self)
 
-
     def run_once(self, timeout=300):
         latch = self._testServer.add_wait_url('/WebGL/results')
-        session = cros_ui.ChromeSession(' --enable-webgl %s' % self._test_url)
+        cros_ui.ChromeSession(' --enable-webgl %s' % self._test_url)
         logging.debug('Chrome session started.')
         latch.wait(timeout)
 
         if not latch.is_set():
             raise error.TestFail('Never received callback from browser.')
+
+        # receive data from webgl-conformance-tests.html::postFinalResults
         results = self._testServer.get_form_entries()
-        total = int(results['total'])
-        passed = int(results['pass'])
-        if passed < total:
-            raise error.TestFail('Results: %d out of %d tests failed!' %
-                                 (total - passed, total))
+        groups_total  = int(results['gtotal'])
+        groups_pass   = int(results['gpass'])
+        groups_fail   = groups_total - groups_pass
+        tests_total   = int(results['ttotal'])
+        tests_pass    = int(results['tpass'])
+        tests_timeout = int(results['ttimeout'])
+        tests_fail    = tests_total - tests_pass
+
+        logging.info('WebGLConformance: %d groups pass',   groups_pass)
+        logging.info('WebGLConformance: %d groups fail',   groups_fail)
+        logging.info('WebGLConformance: %d tests pass',    tests_pass)
+        logging.info('WebGLConformance: %d tests fail',    tests_fail)
+        logging.info('WebGLConformance: %d tests timeout', tests_timeout)
+
+        # output numbers for plotting by harness
+        keyvals = {}
+        keyvals['count_tests_pass']    = tests_pass
+        keyvals['count_tests_fail']    = tests_fail
+        keyvals['count_tests_timeout'] = tests_timeout
+
+        # handle failed groups/urls and apply waivers
+        failTestRun = False
+        i = 0
+        for key in results:
+            unquote_key = urllib.unquote_plus(key)
+            if unquote_key.startswith('failed_url:'):
+                new_key = "waived_url_%03d" % i
+                failures = int(results[key])
+                url = unquote_key[11:]
+                waived_failures = 0
+                if url in self.waived_tests:
+                    waived_failures = self.waived_tests[url]
+                if failures > waived_failures:
+                    failTestRun = True
+                    new_key = "failed_url_%03d" % i
+                message = url + " : %d failures (%d waived)"\
+                                   % (failures, waived_failures)
+                keyvals[new_key] = message
+                logging.info(new_key + "   " + message)
+                i = i+1
+        self.write_perf_keyval(keyvals)
+
+        # write transmitted summary to graphics_WebGLConformance/summary.txt
+        summary = urllib.unquote_plus(results['summary'])
+        logging.info('\n' + summary)
+        results_path = os.path.join(self.bindir,
+              "../../results/default/graphics_WebGLConformance/summary.txt")
+        f = open(results_path, 'w+')
+        f.write(summary)
+        f.close()
+
+        # if we saw failures that were not waived raise an error now
+        if failTestRun:
+            raise error.TestFail('Results: saw failures without waivers. ')
+