diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebKitTools/Scripts | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebKitTools/Scripts')
30 files changed, 529 insertions, 525 deletions
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit index acd7736..4234905 100755 --- a/WebKitTools/Scripts/build-webkit +++ b/WebKitTools/Scripts/build-webkit @@ -2,6 +2,7 @@ # Copyright (C) 2005, 2006 Apple Inc. All rights reserved. # Copyright (C) 2009 Google Inc. All rights reserved. +# Copyright (C) 2010 moiji-mobile.com All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -330,9 +331,7 @@ if (isGtk()) { } foreach (@features) { - if ($_->{option} eq "coverage") { - push @options, XcodeCoverageSupportOptions() if $coverageSupport; - } else { + if ($_->{option} ne "coverage") { my $option = option($_->{define}, ${$_->{value}}, $_->{default}); push @options, $option unless $option eq ""; } @@ -441,7 +440,9 @@ for my $dir (@projects) { $result = buildQMakeQtProject($dir, $clean, @options); } elsif (isAppleMacWebKit()) { $dir = "MiniBrowser" if $dir eq "WebKitTools/MiniBrowser"; - $result = buildXCodeProject($dir, $clean, @options, @ARGV); + my @local_options = @options; + push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $dir ne "ANGLE"; + $result = buildXCodeProject($dir, $clean, @local_options, @ARGV); } elsif (isAppleWinWebKit()) { if ($dir eq "WebKit") { $result = buildVisualStudioProject("win/WebKit.vcproj/WebKit.sln", $clean); diff --git a/WebKitTools/Scripts/check-for-global-initializers b/WebKitTools/Scripts/check-for-global-initializers index 0472901..102fa09 100755 --- a/WebKitTools/Scripts/check-for-global-initializers +++ b/WebKitTools/Scripts/check-for-global-initializers @@ -105,18 +105,19 @@ for my $file (sort @files) { next if $shortName eq "nodes.o"; } if ($target eq "WebCore") { + next if $shortName eq "BidiRun.o"; next if $shortName eq "CachedPage.o"; next if $shortName eq "CachedResource.o"; + next if $shortName eq "FEGaussianBlur.o"; next if $shortName eq "Frame.o"; next if $shortName eq "JSCustomSQLTransactionCallback.o"; next if $shortName eq "JSLazyEventListener.o"; next if $shortName eq "Node.o"; next if $shortName eq "Page.o"; next if $shortName eq "Range.o"; - next if $shortName eq "BidiRun.o"; next if $shortName eq "RenderObject.o"; - next if $shortName eq "SubresourceLoader.o"; next if $shortName eq "SVGElementInstance.o"; + next if $shortName eq "SubresourceLoader.o"; next if $shortName eq "XMLHttpRequest.o"; } if ($target eq "WebKit") { diff --git a/WebKitTools/Scripts/create-html-entity-table b/WebKitTools/Scripts/create-html-entity-table deleted file mode 100755 index c408207..0000000 --- a/WebKitTools/Scripts/create-html-entity-table +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010 Google Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import os.path -import string -import sys - -# Hack sys.path to avoid executing webkitpy __init__.py code which may -# use Python 2.5 features. This code needs to run on Python 2.3 in order -# to support Mac OS X Tiger. -scripts_directory = sys.path[0] -sys.path.append("%s/webkitpy/thirdparty" % scripts_directory) - -import simplejson - - -def convert_entity_to_cpp_name(entity): - postfix = "EntityName" - if entity[-1] == ";": - return "%sSemicolon%s" % (entity[:-1], postfix) - return "%s%s" % (entity, postfix) - - -def convert_entity_to_uchar_array(entity): - return "{'%s'}" % "', '".join(entity) - - -def convert_value_to_int(value): - assert(value[0] == "U") - assert(value[1] == "+") - return "0x" + value[2:] - - -def offset_table_entry(offset): - return " &staticEntityTable[%s]," % offset - - -program_name = os.path.basename(__file__) -if len(sys.argv) < 4 or sys.argv[1] != "-o": - print >> sys.stderr, "Usage: %s -o OUTPUT_FILE INPUT_FILE" % program_name - exit(1) - -output_path = sys.argv[2] -input_path = sys.argv[3] - -html_entity_names_file = open(input_path) -entries = simplejson.load(html_entity_names_file) -html_entity_names_file.close() - -entries.sort(lambda a, b: cmp(a['entity'], b['entity'])) -entity_count = len(entries) - -output_file = open(output_path, "w") - -print >> output_file, """/* - * Copyright (C) 2010 Google, Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -// THIS FILE IS GENERATED BY WebKitTools/Scripts/create-html-entity-table -// DO NOT EDIT (unless you are a ninja)! - -#include "config.h" -#include "HTMLEntityTable.h" - -namespace WebCore { - -namespace { -""" - -for entry in entries: - print >> output_file, "const UChar %sEntityName[] = %s;" % ( - convert_entity_to_cpp_name(entry["entity"]), - convert_entity_to_uchar_array(entry["entity"])) - -print >> output_file, """ -HTMLEntityTableEntry staticEntityTable[%s] = {""" % entity_count - -index = {} -offset = 0 -for entry in entries: - letter = entry["entity"][0] - if not index.get(letter): - index[letter] = offset - print >> output_file, ' { %sEntityName, %s, %s },' % ( - convert_entity_to_cpp_name(entry["entity"]), - len(entry["entity"]), - convert_value_to_int(entry["value"])) - offset += 1 - -print >> output_file, """}; -""" - -print >> output_file, "const HTMLEntityTableEntry* uppercaseOffset[] = {" -for letter in string.uppercase: - print >> output_file, offset_table_entry(index[letter]) -print >> output_file, offset_table_entry(index['a']) -print >> output_file, """}; - -const HTMLEntityTableEntry* lowercaseOffset[] = {""" -for letter in string.lowercase: - print >> output_file, offset_table_entry(index[letter]) -print >> output_file, offset_table_entry(entity_count) -print >> output_file, """}; - -} - -const HTMLEntityTableEntry* HTMLEntityTable::firstEntryStartingWith(UChar c) -{ - if (c >= 'A' && c <= 'Z') - return uppercaseOffset[c - 'A']; - if (c >= 'a' && c <= 'z') - return lowercaseOffset[c - 'a']; - return 0; -} - -const HTMLEntityTableEntry* HTMLEntityTable::lastEntryStartingWith(UChar c) -{ - if (c >= 'A' && c <= 'Z') - return uppercaseOffset[c - 'A' + 1] - 1; - if (c >= 'a' && c <= 'z') - return lowercaseOffset[c - 'a' + 1] - 1; - return 0; -} - -const HTMLEntityTableEntry* HTMLEntityTable::firstEntry() -{ - return &staticEntityTable[0]; -} - -const HTMLEntityTableEntry* HTMLEntityTable::lastEntry() -{ - return &staticEntityTable[%s - 1]; -} - -} -""" % entity_count diff --git a/WebKitTools/Scripts/enumerate-included-framework-headers b/WebKitTools/Scripts/enumerate-included-framework-headers deleted file mode 100755 index 598a790..0000000 --- a/WebKitTools/Scripts/enumerate-included-framework-headers +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009, 2010 University of Szeged -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# A script to find and enumerate headers included from the given frameworks by files in the -# current directory (and subdirectories). - -# FIXME: This should be rewritten in perl. -# FIXME: Currently only works for qt. - -platform_prefixes=android/\|brew/\|cf/\|chromium/\|curl\|efl/\|gtk/\|haiku/\|mac/\|soup\|v8\|win/\|wx/ - -for framework in $*; do - headers=`find . \( -name '*.cpp' -o -name '*.h' \) -exec grep "<$framework/" {} ';' | sed -e 's|.*/\(.*\.h\).*|\1|' | sort -u` - - for header in $headers - do - header_paths=`find ../$framework -name $header | sed "s/..\/$framework\///"` - - if test `echo $header_paths | wc -w` -eq 1 - then - header_path=$header_paths - if test `echo $header_path | grep -c -E $platform_prefixes` -ne 0 - then - continue - fi - else - for path in $header_paths - do - if test `echo $path | grep -c -E $platform_prefixes` -eq 0 - then - header_path=$path - break - fi - done - fi - - echo -n "$header_path " - done -done diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog index 45aca1b..c2adaf5 100755 --- a/WebKitTools/Scripts/prepare-ChangeLog +++ b/WebKitTools/Scripts/prepare-ChangeLog @@ -715,7 +715,7 @@ sub get_function_line_ranges_for_c($$) if (!$in_braces and $potential_start) { $start = $potential_start; $name = $potential_name; - if (@namespaces && (length($name) < 2 || substr($name,1,1) ne "[")) { + if (@namespaces && $name && (length($name) < 2 || substr($name,1,1) ne "[")) { $name = join ('::', @namespaces, $name); } } diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm index 3901611..b4d3f60 100644 --- a/WebKitTools/Scripts/webkitdirs.pm +++ b/WebKitTools/Scripts/webkitdirs.pm @@ -403,7 +403,7 @@ sub XcodeCoverageSupportOptions() push @coverageSupportOptions, "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES"; push @coverageSupportOptions, "EXTRA_LINK= \$(EXTRA_LINK) -ftest-coverage -fprofile-arcs"; push @coverageSupportOptions, "OTHER_CFLAGS= \$(OTHER_CFLAGS) -DCOVERAGE -MD"; - push @coverageSupportOptions, "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ftest-coverage -fprofile-arcs -framework AppKit"; + push @coverageSupportOptions, "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ftest-coverage -fprofile-arcs -lgcov"; return @coverageSupportOptions; } diff --git a/WebKitTools/Scripts/webkitpy/common/config/committers.py b/WebKitTools/Scripts/webkitpy/common/config/committers.py index 5110db1..19ebc5f 100644 --- a/WebKitTools/Scripts/webkitpy/common/config/committers.py +++ b/WebKitTools/Scripts/webkitpy/common/config/committers.py @@ -81,6 +81,7 @@ committers_unable_to_review = [ Committer("Ben Murdoch", "benm@google.com", "benm"), Committer("Benjamin C Meyer", ["ben@meyerhome.net", "ben@webkit.org"], "icefox"), Committer("Benjamin Otte", ["otte@gnome.org", "otte@webkit.org"], "otte"), + Committer("Benjamin Poulain", ["benjamin.poulain@nokia.com", "ikipou@gmail.com"]), Committer("Brent Fulgham", "bfulgham@webkit.org", "bfulgham"), Committer("Brett Wilson", "brettw@chromium.org", "brettx"), Committer("Brian Weinstein", "bweinstein@apple.com", "bweinstein"), @@ -88,7 +89,6 @@ committers_unable_to_review = [ Committer("Carol Szabo", "carol.szabo@nokia.com"), Committer("Chang Shu", "Chang.Shu@nokia.com"), Committer("Chris Evans", "cevans@google.com"), - Committer("Chris Marrin", "cmarrin@apple.com", "cmarrin"), Committer("Chris Petersen", "cpetersen@apple.com", "cpetersen"), Committer("Christian Dywan", ["christian@twotoasts.de", "christian@webkit.org"]), Committer("Collin Jackson", "collinj@webkit.org"), @@ -167,6 +167,7 @@ committers_unable_to_review = [ Committer("Tony Gentilcore", "tonyg@chromium.org", "tonyg-cr"), Committer("Trey Matteson", "trey@usa.net", "trey"), Committer("Tristan O'Tierney", ["tristan@otierney.net", "tristan@apple.com"]), + Committer("Vangelis Kokkevis", "vangelis@chromium.org", "vangelis"), Committer("Victor Wang", "victorw@chromium.org", "victorw"), Committer("Vitaly Repeshko", "vitalyr@chromium.org"), Committer("William Siegrist", "wsiegrist@apple.com", "wms"), @@ -204,6 +205,7 @@ reviewers_list = [ Reviewer("Brady Eidson", "beidson@apple.com", "bradee-oh"), Reviewer("Cameron Zwarich", ["zwarich@apple.com", "cwzwarich@apple.com", "cwzwarich@webkit.org"]), Reviewer("Chris Blumenberg", "cblu@apple.com", "cblu"), + Reviewer("Chris Marrin", "cmarrin@apple.com", "cmarrin"), Reviewer("Chris Fleizach", "cfleizach@apple.com", "cfleizach"), Reviewer("Chris Jerdonek", "cjerdonek@webkit.org", "cjerdonek"), Reviewer("Dan Bernstein", ["mitz@webkit.org", "mitz@apple.com"], "mitzpettel"), diff --git a/WebKitTools/Scripts/webkitpy/common/config/ports.py b/WebKitTools/Scripts/webkitpy/common/config/ports.py index 9d4ac3f..ebd88b1 100644 --- a/WebKitTools/Scripts/webkitpy/common/config/ports.py +++ b/WebKitTools/Scripts/webkitpy/common/config/ports.py @@ -49,6 +49,7 @@ class WebKitPort(object): "mac": MacPort, "win": WinPort, "qt": QtPort, + "efl": EflPort, } default_port = { "Windows": WinPort, @@ -177,6 +178,24 @@ class QtPort(WebKitPort): return command +class EflPort(WebKitPort): + + @classmethod + def name(cls): + return "Efl" + + @classmethod + def flag(cls): + return "--port=efl" + + @classmethod + def build_webkit_command(cls, build_style=None): + command = WebKitPort.build_webkit_command(build_style=build_style) + command.append("--efl") + command.append(WebKitPort.makeArgs()) + return command + + class ChromiumPort(WebKitPort): @classmethod diff --git a/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py b/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py index 40db32c..2b2258e 100644 --- a/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py +++ b/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py @@ -341,11 +341,8 @@ class CommitterValidator(object): flag_name, contribution_guidlines) message += "\n\n- If you have %s rights please correct the error in %s by adding yourself to the file (no review needed). " % ( flag_name, committers_list) - message += "Due to bug 30084 the %s will require a restart after your change. " % queue_name - message += "Please contact %s to request a %s restart. " % ( - queue_administrator, queue_name) - message += "After restart the %s will correctly respect your %s rights." % ( - queue_name, flag_name) + message += "The %s restarts itself every 2 hours. After restart the %s will correctly respect your %s rights." % ( + queue_name, queue_name, flag_name) return message def _validate_setter_email(self, patch, result_key, rejection_function): @@ -521,6 +518,8 @@ class Bugzilla(object): def fetch_bug_dictionary(self, bug_id): try: return self._parse_bug_page(self._fetch_bug_page(bug_id)) + except KeyboardInterrupt: + raise except: self.authenticate() return self._parse_bug_page(self._fetch_bug_page(bug_id)) diff --git a/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py b/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py index 3556121..280696e 100644 --- a/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py +++ b/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py @@ -68,7 +68,7 @@ class CommitterValidatorTest(unittest.TestCase): - If you do not have review rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. -- If you have review rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your review rights.""" +- If you have review rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your review rights.""" self.assertEqual(validator._flag_permission_rejection_message("foo@foo.com", "review"), expected_messsage) diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/data/failures/expected/exception.html b/WebKitTools/Scripts/webkitpy/layout_tests/data/failures/expected/exception.html new file mode 100644 index 0000000..38c54e3 --- /dev/null +++ b/WebKitTools/Scripts/webkitpy/layout_tests/data/failures/expected/exception.html @@ -0,0 +1 @@ +exception diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/data/failures/expected/keyboard.html b/WebKitTools/Scripts/webkitpy/layout_tests/data/failures/expected/keyboard.html new file mode 100644 index 0000000..c253983 --- /dev/null +++ b/WebKitTools/Scripts/webkitpy/layout_tests/data/failures/expected/keyboard.html @@ -0,0 +1 @@ +keyboard diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/data/passes/error-expected.txt b/WebKitTools/Scripts/webkitpy/layout_tests/data/passes/error-expected.txt new file mode 100644 index 0000000..9427269 --- /dev/null +++ b/WebKitTools/Scripts/webkitpy/layout_tests/data/passes/error-expected.txt @@ -0,0 +1 @@ +error-txt diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/data/passes/error.html b/WebKitTools/Scripts/webkitpy/layout_tests/data/passes/error.html new file mode 100644 index 0000000..8276753 --- /dev/null +++ b/WebKitTools/Scripts/webkitpy/layout_tests/data/passes/error.html @@ -0,0 +1 @@ +error diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/data/platform/test/test_expectations.txt b/WebKitTools/Scripts/webkitpy/layout_tests/data/platform/test/test_expectations.txt index 6e66caa..16556e3 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/data/platform/test/test_expectations.txt +++ b/WebKitTools/Scripts/webkitpy/layout_tests/data/platform/test/test_expectations.txt @@ -8,3 +8,5 @@ WONTFIX : failures/expected/missing_image.html = MISSING PASS WONTFIX : failures/expected/missing_text.html = MISSING PASS WONTFIX : failures/expected/text.html = TEXT WONTFIX : failures/expected/timeout.html = TIMEOUT +WONTFIX SKIP : failures/expected/keyboard.html = CRASH +WONTFIX SKIP : failures/expected/exception.html = CRASH diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py index 6343400..ec33086 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py @@ -169,6 +169,11 @@ class SingleTestThread(threading.Thread): self._output_dir = output_dir def run(self): + self._covered_run() + + def _covered_run(self): + # FIXME: this is a separate routine to work around a bug + # in coverage: see http://bitbucket.org/ned/coveragepy/issue/85. test_info = self._test_info driver = self._port.create_driver(self._image_path, self._shell_args) driver.start() @@ -287,6 +292,11 @@ class TestShellThread(WatchableThread): def run(self): """Delegate main work to a helper method and watch for uncaught exceptions.""" + self._covered_run() + + def _covered_run(self): + # FIXME: this is a separate routine to work around a bug + # in coverage: see http://bitbucket.org/ned/coveragepy/issue/85. self._thread_id = thread.get_ident() self._start_time = time.time() self._num_tests = 0 @@ -303,9 +313,9 @@ class TestShellThread(WatchableThread): self._exception_info = sys.exc_info() self._stop_time = time.time() # Re-raise it and die. - _log.error('%s dying: %s' % (self.getName(), + _log.error('%s dying, exception raised: %s' % (self.getName(), self._exception_info)) - raise + self._stop_time = time.time() def run_in_main_thread(self, test_runner, result_summary): @@ -321,14 +331,8 @@ class TestShellThread(WatchableThread): If test_runner is not None, then we call test_runner.UpdateSummary() with the results of each test.""" - batch_size = 0 + batch_size = self._options.batch_size batch_count = 0 - if self._options.batch_size: - try: - batch_size = int(self._options.batch_size) - except: - _log.info("Ignoring invalid batch size '%s'" % - self._options.batch_size) # Append tests we're running to the existing tests_run.txt file. # This is created in run_webkit_tests.py:_PrepareListsAndPrintOutput. diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py index a9c6d5b..9421ff8 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py @@ -34,7 +34,6 @@ import optparse import pdb import sys import unittest -import logging from webkitpy.common.array_stream import ArrayStream from webkitpy.layout_tests.layout_package import metered_stream @@ -97,13 +96,19 @@ class TestMeteredStream(unittest.TestCase): m.write("foo") self.assertEquals(a.get(), ['foo']) + import logging + b = ArrayStream() + logger = logging.getLogger() + handler = logging.StreamHandler(b) + logger.addHandler(handler) m.update("bar") - # FIXME: figure out how to test that this went to the logger. Is this - # good enough? + logger.handlers.remove(handler) self.assertEquals(a.get(), ['foo']) + self.assertEquals(b.get(), ['bar\n']) m.progress("dropped") self.assertEquals(a.get(), ['foo']) + self.assertEquals(b.get(), ['bar\n']) if __name__ == '__main__': diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py index a9e015f..d420631 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py @@ -126,19 +126,6 @@ def print_options(): ] -def configure_logging(options, meter): - """Configures the logging system.""" - log_fmt = '%(message)s' - log_datefmt = '%y%m%d %H:%M:%S' - log_level = logging.INFO - if options.verbose: - log_fmt = ('%(asctime)s %(filename)s:%(lineno)-4d %(levelname)s ' - '%(message)s') - log_level = logging.DEBUG - - logging.basicConfig(level=log_level, format=log_fmt, - datefmt=log_datefmt, stream=meter) - def parse_print_options(print_options, verbose, child_processes, is_fully_parallel): @@ -190,6 +177,28 @@ def parse_print_options(print_options, verbose, child_processes, return switches +def _configure_logging(stream, verbose): + log_fmt = '%(message)s' + log_datefmt = '%y%m%d %H:%M:%S' + log_level = logging.INFO + if verbose: + log_fmt = ('%(asctime)s %(filename)s:%(lineno)-4d %(levelname)s ' + '%(message)s') + log_level = logging.DEBUG + + root = logging.getLogger() + handler = logging.StreamHandler(stream) + handler.setFormatter(logging.Formatter(log_fmt, None)) + root.addHandler(handler) + root.setLevel(log_level) + return handler + + +def _restore_logging(handler_to_remove): + root = logging.getLogger() + root.handlers.remove(handler_to_remove) + + class Printer(object): """Class handling all non-debug-logging printing done by run-webkit-tests. @@ -237,12 +246,22 @@ class Printer(object): self._meter = metered_stream.MeteredStream(options.verbose, regular_output) - configure_logging(self._options, self._meter) + self._logging_handler = _configure_logging(self._meter, + options.verbose) self.switches = parse_print_options(options.print_options, options.verbose, child_processes, is_fully_parallel) - # These two routines just hide the implmentation of the switches. + def cleanup(self): + """Restore logging configuration to its initial settings.""" + if self._logging_handler: + _restore_logging(self._logging_handler) + self._logging_handler = None + + def __del__(self): + self.cleanup() + + # These two routines just hide the implementation of the switches. def disabled(self, option): return not option in self.switches diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py index 40c691f..29139d0 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py @@ -37,6 +37,7 @@ import unittest import logging from webkitpy.common import array_stream +from webkitpy.common.system import logtesting from webkitpy.layout_tests import port from webkitpy.layout_tests.layout_package import printing from webkitpy.layout_tests.layout_package import dump_render_tree_thread @@ -53,25 +54,24 @@ def get_options(args): class TestUtilityFunctions(unittest.TestCase): def test_configure_logging(self): - # FIXME: We need to figure out how to reset the basic logger. - # FIXME: If other testing classes call logging.basicConfig() then - # FIXME: these calls become no-ops and we can't control the - # FIXME: configuration to test things properly. options, args = get_options([]) stream = array_stream.ArrayStream() - printing.configure_logging(options, stream) + handler = printing._configure_logging(stream, options.verbose) logging.info("this should be logged") - # self.assertFalse(stream.empty()) + self.assertFalse(stream.empty()) stream.reset() logging.debug("this should not be logged") - # self.assertTrue(stream.empty()) + self.assertTrue(stream.empty()) + + printing._restore_logging(handler) stream.reset() options, args = get_options(['--verbose']) - printing.configure_logging(options, stream) + handler = printing._configure_logging(stream, options.verbose) logging.debug("this should be logged") - # self.assertFalse(stream.empty()) + self.assertFalse(stream.empty()) + printing._restore_logging(handler) def test_print_options(self): options, args = get_options([]) @@ -190,6 +190,14 @@ class Testprinter(unittest.TestCase): do_helper(method_name, switch, 'hello', exp_err, exp_bot) do_helper(method_name, 'everything', 'hello', exp_err, exp_bot) + def test_configure_and_cleanup(self): + # This test verifies that calling cleanup repeatedly and deleting + # the object is safe. + printer, err, out = self.get_printer(['--print', 'everything']) + printer.cleanup() + printer.cleanup() + printer = None + def test_print_actual(self): # Actual results need to be logged to the buildbot's stream. self.do_switch_tests('print_actual', 'actual', to_buildbot=True) @@ -421,11 +429,12 @@ class Testprinter(unittest.TestCase): self.assertFalse(err.empty()) self.assertTrue(out.empty()) - def test_write(self): + def test_write_nothing(self): printer, err, out = self.get_printer(['--print', 'nothing']) printer.write("foo") self.assertTrue(err.empty()) + def test_write_misc(self): printer, err, out = self.get_printer(['--print', 'misc']) printer.write("foo") self.assertFalse(err.empty()) @@ -433,6 +442,7 @@ class Testprinter(unittest.TestCase): printer.write("foo", "config") self.assertTrue(err.empty()) + def test_write_everything(self): printer, err, out = self.get_printer(['--print', 'everything']) printer.write("foo") self.assertFalse(err.empty()) @@ -440,11 +450,10 @@ class Testprinter(unittest.TestCase): printer.write("foo", "config") self.assertFalse(err.empty()) - # FIXME: this should be logged somewhere, but it actually - # disappears into the ether in the logging subsystem. + def test_write_verbose(self): printer, err, out = self.get_printer(['--verbose']) printer.write("foo") - self.assertTrue(err.empty()) + self.assertTrue(not err.empty() and "foo" in err.get()[0]) self.assertTrue(out.empty()) def test_print_unexpected_results(self): diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py index 086321d..3d8349b 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py @@ -477,6 +477,7 @@ class TestExpectationsFile: the updated string. """ + assert(platform) f_orig = self._get_iterable_expectations(self._expectations) f_new = [] @@ -487,6 +488,8 @@ class TestExpectationsFile: lineno += 1 action = self._get_platform_update_action(line, lineno, tests, platform) + assert(action in (NO_CHANGE, REMOVE_TEST, REMOVE_PLATFORM, + ADD_PLATFORMS_EXCEPT_THIS)) if action == NO_CHANGE: # Save the original line back to the file _log.debug('No change to test: %s', line) @@ -522,9 +525,6 @@ class TestExpectationsFile: _log.info('Test updated: ') _log.info(' old: %s', line) _log.info(' new: %s', new_line) - else: - _log.error('Unknown update action: %d; line: %s', - action, line) _log.info('Total tests removed: %d', tests_removed) _log.info('Total tests updated: %d', tests_updated) diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py index 22214b0..26eb18d 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py @@ -93,14 +93,16 @@ class Base(unittest.TestCase): self.get_test('failures/expected/image_checksum.html'), self.get_test('failures/expected/crash.html'), self.get_test('failures/expected/missing_text.html'), + self.get_test('failures/expected/image.html'), self.get_test('passes/text.html')] def get_basic_expectations(self): return """ BUG_TEST : failures/expected/text.html = TEXT -BUG_TEST SKIP : failures/expected/crash.html = CRASH -BUG_TEST REBASELINE : failure/expected/missing_image.html = MISSING -BUG_TEST : failures/expected/image_checksum.html = IMAGE +BUG_TEST WONTFIX SKIP : failures/expected/crash.html = CRASH +BUG_TEST REBASELINE : failures/expected/missing_image.html = MISSING +BUG_TEST WONTFIX : failures/expected/image_checksum.html = IMAGE +BUG_TEST WONTFIX WIN : failures/expected/image.html = IMAGE """ def parse_exp(self, expectations, overrides=None, is_lint_mode=False, @@ -125,6 +127,13 @@ class TestExpectationsTest(Base): self.assert_exp('failures/expected/text.html', TEXT) self.assert_exp('failures/expected/image_checksum.html', IMAGE) self.assert_exp('passes/text.html', PASS) + self.assert_exp('failures/expected/image.html', PASS) + + def test_multiple_results(self): + self.parse_exp('BUGX : failures/expected/text.html = TEXT CRASH') + self.assertEqual(self._exp.get_expectations( + self.get_test('failures/expected/text.html')), + set([TEXT, CRASH])) def test_defer(self): self.parse_exp('BUGX DEFER : failures/expected/text.html = TEXT') @@ -183,6 +192,20 @@ BUGX DEFER : failures/expected = IMAGE self.assertRaises(ValueError, self._exp.expectation_to_string, -1) + def test_get_test_set(self): + # Handle some corner cases for this routine not covered by other tests. + self.parse_exp(self.get_basic_expectations()) + s = self._exp._expected_failures.get_test_set(WONTFIX) + self.assertEqual(s, + set([self.get_test('failures/expected/crash.html'), + self.get_test('failures/expected/image_checksum.html')])) + s = self._exp._expected_failures.get_test_set(WONTFIX, CRASH) + self.assertEqual(s, + set([self.get_test('failures/expected/crash.html')])) + s = self._exp._expected_failures.get_test_set(WONTFIX, CRASH, + include_skips=False) + self.assertEqual(s, set([])) + def test_syntax_missing_expectation(self): # This is missing the expectation. self.assertRaises(SyntaxError, self.parse_exp, @@ -230,6 +253,13 @@ BUG_TEST : failures/expected/text.html = IMAGE""") BUG_TEST : failures/expected/text.html = TEXT BUG_TEST : failures/expected/text.html = IMAGE""") + def test_semantic_missing_file(self): + # This should log a non-fatal error. + self.parse_exp('BUG_TEST : missing_file.html = TEXT') + self.assertEqual( + len(self._exp._expected_failures.get_non_fatal_errors()), 1) + + def test_overrides(self): self.parse_exp(self.get_basic_expectations(), """ BUG_OVERRIDE : failures/expected/text.html = IMAGE""") @@ -256,20 +286,43 @@ BUG_OVERRIDE : failures/expected/text.html = IMAGE""") class RebaseliningTest(Base): """Test rebaselining-specific functionality.""" + def assertRemove(self, platform, input_expectations, expected_expectations): + self.parse_exp(input_expectations) + test = self.get_test('failures/expected/text.html') + actual_expectations = self._exp.remove_platform_from_expectations( + test, platform) + self.assertEqual(expected_expectations, actual_expectations) + def test_no_get_rebaselining_failures(self): self.parse_exp(self.get_basic_expectations()) self.assertEqual(len(self._exp.get_rebaselining_failures()), 0) - def test_basic(self): + def test_get_rebaselining_failures_expand(self): self.parse_exp(""" BUG_TEST REBASELINE : failures/expected/text.html = TEXT """) self.assertEqual(len(self._exp.get_rebaselining_failures()), 1) - new_exp_str = self._exp.remove_platform_from_expectations( - self.get_test('failures/expected/text.html'), 'TEST') - # FIXME: actually test rebaselining - # self.assertEqual(new_exp_str, '\n') + def test_remove_expand(self): + self.assertRemove('mac', + 'BUGX REBASELINE : failures/expected/text.html = TEXT\n', + 'BUGX REBASELINE WIN : failures/expected/text.html = TEXT\n') + + def test_remove_mac_win(self): + self.assertRemove('mac', + 'BUGX REBASELINE MAC WIN : failures/expected/text.html = TEXT\n', + 'BUGX REBASELINE WIN : failures/expected/text.html = TEXT\n') + + def test_remove_mac_mac(self): + self.assertRemove('mac', + 'BUGX REBASELINE MAC : failures/expected/text.html = TEXT\n', + '') + + def test_remove_nothing(self): + self.assertRemove('mac', + '\n\n', + '\n\n') + if __name__ == '__main__': unittest.main() diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py index af1af93..0dda774 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py @@ -327,7 +327,6 @@ class Port(object): if not self._webkit_base_dir: abspath = os.path.abspath(__file__) self._webkit_base_dir = abspath[0:abspath.find('WebKitTools')] - _log.debug("Using WebKit root: %s" % self._webkit_base_dir) return os.path.join(self._webkit_base_dir, *comps) diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py index 4fe3ec1..e309334 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py @@ -118,10 +118,10 @@ class TestPort(base.Port): return file.read() def test_base_platform_names(self): - return ('test',) + return ('mac', 'win') def test_platform_name(self): - return 'test' + return 'mac' def test_platform_names(self): return self.test_base_platform_names() @@ -151,7 +151,10 @@ class TestDriver(base.Driver): def run_test(self, uri, timeoutms, image_hash): basename = uri[(uri.rfind("/") + 1):uri.rfind(".html")] - error = '' + if 'error' in basename: + error = basename + "_error\n" + else: + error = '' checksum = None # There are four currently supported types of tests: text, image, # image hash (checksum), and stderr output. The fake output @@ -170,10 +173,13 @@ class TestDriver(base.Driver): # will allow us to see if any results get crossed by the rest of the # program. if 'failures' in uri: + if 'keyboard' in basename: + raise KeyboardInterrupt + if 'exception' in basename: + raise ValueError('exception from ' + basename) + crash = 'crash' in basename timeout = 'timeout' in basename - if 'error' in basename: - error = basename + "_error\n" if 'text' in basename: output = basename + '_failed-txt\n' else: diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py index 7163e1b..4132260 100755 --- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py @@ -75,7 +75,6 @@ from test_types import image_diff from test_types import text_diff from test_types import test_type_base -from webkitpy.common.system.executive import Executive from webkitpy.thirdparty import simplejson import port @@ -106,12 +105,11 @@ class TestInfo: self._image_hash = None def _read_image_hash(self): - try: - with codecs.open(self._expected_hash_path, "r", "ascii") as hash_file: - return hash_file.read() - except IOError, e: - if errno.ENOENT != e.errno: - raise + if not os.path.exists(self._expected_hash_path): + return None + + with codecs.open(self._expected_hash_path, "r", "ascii") as hash_file: + return hash_file.read() def image_hash(self): # Read the image_hash lazily to reduce startup time. @@ -273,35 +271,42 @@ class TestRunner: # options.results_directory, use_tls=True, port=9323) # a list of TestType objects - self._test_types = [] + self._test_types = [text_diff.TestTextDiff] + if options.pixel_tests: + self._test_types.append(image_diff.ImageDiff) # a set of test files, and the same tests as a list self._test_files = set() self._test_files_list = None self._result_queue = Queue.Queue() - self._retrying = False - # Hack for dumping threads on the bots - self._last_thread_dump = None - - def __del__(self): - _log.debug("flushing stdout") - sys.stdout.flush() - _log.debug("flushing stderr") - sys.stderr.flush() - _log.debug("stopping http server") - self._port.stop_http_server() - _log.debug("stopping websocket server") - self._port.stop_websocket_server() - - def gather_file_paths(self, paths): + def collect_tests(self, args, last_unexpected_results): """Find all the files to test. Args: - paths: a list of globs to use instead of the defaults.""" + args: list of test arguments from the command line + last_unexpected_results: list of unexpected results to retest, if any + + """ + paths = [arg for arg in args if arg and arg != ''] + paths += last_unexpected_results + if self._options.test_list: + paths += read_test_files(self._options.test_list) self._test_files = test_files.gather_test_files(self._port, paths) + def lint(self): + # Creating the expecations for each platform/configuration pair does + # all the test list parsing and ensures it's correct syntax (e.g. no + # dupes). + for platform_name in self._port.test_platform_names(): + self.parse_expectations(platform_name, is_debug_mode=True) + self.parse_expectations(platform_name, is_debug_mode=False) + self._printer.write("") + _log.info("If there are no fail messages, errors or exceptions, " + "then the lint succeeded.") + return 0 + def parse_expectations(self, test_platform_name, is_debug_mode): """Parse the expectations from the test_list files and return a data structure holding them. Throws an error if the test_list files have @@ -336,8 +341,8 @@ class TestRunner: self._printer.print_expected("Found: %d tests" % (len(self._test_files))) if not num_all_test_files: - _log.critical("No tests to run.") - sys.exit(1) + _log.critical('No tests to run.') + return None skipped = set() if num_all_test_files > 1 and not self._options.force: @@ -468,10 +473,6 @@ class TestRunner: return result_summary - def add_test_type(self, test_type): - """Add a TestType to the TestRunner.""" - self._test_types.append(test_type) - def _get_dir_for_test_file(self, test_file): """Returns the highest-level directory by which to shard the given test file.""" @@ -643,7 +644,7 @@ class TestRunner: """ # FIXME: We should use webkitpy.tool.grammar.pluralize here. plural = "" - if self._options.child_processes > 1: + if not self._is_single_threaded(): plural = "s" self._printer.print_update('Starting %s%s ...' % (self._port.driver_name(), plural)) @@ -714,6 +715,49 @@ class TestRunner: """Returns whether the test runner needs an HTTP server.""" return self._contains_tests(self.HTTP_SUBDIR) + def set_up_run(self): + """Configures the system to be ready to run tests. + + Returns a ResultSummary object if we should continue to run tests, + or None if we should abort. + + """ + # This must be started before we check the system dependencies, + # since the helper may do things to make the setup correct. + self._printer.print_update("Starting helper ...") + self._port.start_helper() + + # Check that the system dependencies (themes, fonts, ...) are correct. + if not self._options.nocheck_sys_deps: + self._printer.print_update("Checking system dependencies ...") + if not self._port.check_sys_deps(self.needs_http()): + self._port.stop_helper() + return None + + if self._options.clobber_old_results: + self._clobber_old_results() + + # Create the output directory if it doesn't already exist. + self._port.maybe_make_directory(self._options.results_directory) + + self._port.setup_test_run() + + self._printer.print_update("Preparing tests ...") + result_summary = self.prepare_lists_and_print_output() + if not result_summary: + return None + + if self.needs_http(): + self._printer.print_update('Starting HTTP server ...') + self._port.start_http_server() + + if self._contains_tests(self.WEBSOCKET_SUBDIR): + self._printer.print_update('Starting WebSocket server ...') + self._port.start_websocket_server() + # self._websocket_secure_server.Start() + + return result_summary + def run(self, result_summary): """Run all our tests on all our test files. @@ -726,19 +770,12 @@ class TestRunner: Return: The number of unexpected results (0 == success) """ - if not self._test_files: - return 0 - start_time = time.time() + # gather_test_files() must have been called first to initialize us. + # If we didn't find any files to test, we've errored out already in + # prepare_lists_and_print_output(). + assert(len(self._test_files)) - if self.needs_http(): - self._printer.print_update('Starting HTTP server ...') - - self._port.start_http_server() - - if self._contains_tests(self.WEBSOCKET_SUBDIR): - self._printer.print_update('Starting WebSocket server ...') - self._port.start_websocket_server() - # self._websocket_secure_server.Start() + start_time = time.time() keyboard_interrupted, thread_timings, test_timings, \ individual_test_timings = ( @@ -801,6 +838,20 @@ class TestRunner: # bot red for those. return unexpected_results['num_regressions'] + def clean_up_run(self): + """Restores the system after we're done running tests.""" + + _log.debug("flushing stdout") + sys.stdout.flush() + _log.debug("flushing stderr") + sys.stderr.flush() + _log.debug("stopping http server") + self._port.stop_http_server() + _log.debug("stopping websocket server") + self._port.stop_websocket_server() + _log.debug("stopping helper") + self._port.stop_helper() + def update_summary(self, result_summary): """Update the summary and print results with any completed tests.""" while True: @@ -819,6 +870,20 @@ class TestRunner: self._printer.print_progress(result_summary, self._retrying, self._test_files_list) + def _clobber_old_results(self): + # Just clobber the actual test results directories since the other + # files in the results directory are explicitly used for cross-run + # tracking. + self._printer.print_update("Clobbering old results in %s" % + self._options.results_directory) + layout_tests_dir = self._port.layout_tests_dir() + possible_dirs = os.listdir(layout_tests_dir) + for dirname in possible_dirs: + if os.path.isdir(os.path.join(layout_tests_dir, dirname)): + shutil.rmtree(os.path.join(self._options.results_directory, + dirname), + ignore_errors=True) + def _get_failures(self, result_summary, include_crashes): """Filters a dict of results and returns only the failures. @@ -911,6 +976,33 @@ class TestRunner: _log.info("JSON files uploaded.") + def _print_config(self): + """Prints the configuration for the test run.""" + p = self._printer + p.print_config("Using port '%s'" % self._port.name()) + p.print_config("Placing test results in %s" % + self._options.results_directory) + if self._options.new_baseline: + p.print_config("Placing new baselines in %s" % + self._port.baseline_path()) + p.print_config("Using %s build" % self._options.configuration) + if self._options.pixel_tests: + p.print_config("Pixel tests enabled") + else: + p.print_config("Pixel tests disabled") + + p.print_config("Regular timeout: %s, slow test timeout: %s" % + (self._options.time_out_ms, + self._options.slow_time_out_ms)) + + if self._is_single_threaded(): + p.print_config("Running one %s" % self._port.driver_name()) + else: + p.print_config("Running %s %ss in parallel" % + (self._options.child_processes, + self._port.driver_name())) + p.print_config("") + def _print_expected_results_of_type(self, result_summary, result_type, result_type_str): """Print the number of the tests in a given result class. @@ -1266,12 +1358,12 @@ def read_test_files(files): return tests -def run(port_obj, options, args, regular_output=sys.stderr, +def run(port, options, args, regular_output=sys.stderr, buildbot_output=sys.stdout): """Run the tests. Args: - port_obj: Port object for port-specific behavior + port: Port object for port-specific behavior options: a dictionary of command line options args: a list of sub directories or files to test regular_output: a stream-like object that we can send logging/debug @@ -1281,24 +1373,61 @@ def run(port_obj, options, args, regular_output=sys.stderr, Returns: the number of unexpected results that occurred, or -1 if there is an error. - """ - # Configure the printing subsystem for printing output, logging debug - # info, and tracing tests. - - if not options.child_processes: - # FIXME: Investigate perf/flakiness impact of using cpu_count + 1. - options.child_processes = port_obj.default_child_processes() + """ + _set_up_derived_options(port, options) - printer = printing.Printer(port_obj, options, regular_output=regular_output, - buildbot_output=buildbot_output, - child_processes=int(options.child_processes), - is_fully_parallel=options.experimental_fully_parallel) + printer = printing.Printer(port, options, regular_output, buildbot_output, + int(options.child_processes), options.experimental_fully_parallel) if options.help_printing: printer.help_printing() + printer.cleanup() return 0 - executive = Executive() + last_unexpected_results = _gather_unexpected_results(options) + if options.print_last_failures: + printer.write("\n".join(last_unexpected_results) + "\n") + printer.cleanup() + return 0 + + # We wrap any parts of the run that are slow or likely to raise exceptions + # in a try/finally to ensure that we clean up the logging configuration. + num_unexpected_results = -1 + try: + test_runner = TestRunner(port, options, printer) + test_runner._print_config() + + printer.print_update("Collecting tests ...") + test_runner.collect_tests(args, last_unexpected_results) + + printer.print_update("Parsing expectations ...") + if options.lint_test_files: + return test_runner.lint() + test_runner.parse_expectations(port.test_platform_name(), + options.configuration == 'Debug') + + printer.print_update("Checking build ...") + if not port.check_build(test_runner.needs_http()): + return -1 + + result_summary = test_runner.set_up_run() + if result_summary: + num_unexpected_results = test_runner.run(result_summary) + test_runner.clean_up_run() + _log.debug("Testing completed, Exit status: %d" % + num_unexpected_results) + finally: + printer.cleanup() + + return num_unexpected_results + + +def _set_up_derived_options(port_obj, options): + """Sets the options values that depend on other options values.""" + + if not options.child_processes: + # FIXME: Investigate perf/flakiness impact of using cpu_count + 1. + options.child_processes = str(port_obj.default_child_processes()) if not options.configuration: options.configuration = port_obj.default_configuration() @@ -1318,30 +1447,6 @@ def run(port_obj, options, args, regular_output=sys.stderr, # Debug or Release. options.results_directory = port_obj.results_directory() - last_unexpected_results = [] - if options.print_last_failures or options.retest_last_failures: - unexpected_results_filename = os.path.join( - options.results_directory, "unexpected_results.json") - with codecs.open(unexpected_results_filename, "r", "utf-8") as file: - results = simplejson.load(file) - last_unexpected_results = results['tests'].keys() - if options.print_last_failures: - printer.write("\n".join(last_unexpected_results) + "\n") - return 0 - - if options.clobber_old_results: - # Just clobber the actual test results directories since the other - # files in the results directory are explicitly used for cross-run - # tracking. - printer.print_update("Clobbering old results in %s" % - options.results_directory) - layout_tests_dir = port_obj.layout_tests_dir() - possible_dirs = os.listdir(layout_tests_dir) - for dirname in possible_dirs: - if os.path.isdir(os.path.join(layout_tests_dir, dirname)): - shutil.rmtree(os.path.join(options.results_directory, dirname), - ignore_errors=True) - if not options.time_out_ms: if options.configuration == "Debug": options.time_out_ms = str(2 * TestRunner.DEFAULT_TEST_TIMEOUT_MS) @@ -1349,92 +1454,18 @@ def run(port_obj, options, args, regular_output=sys.stderr, options.time_out_ms = str(TestRunner.DEFAULT_TEST_TIMEOUT_MS) options.slow_time_out_ms = str(5 * int(options.time_out_ms)) - printer.print_config("Regular timeout: %s, slow test timeout: %s" % - (options.time_out_ms, options.slow_time_out_ms)) - - if int(options.child_processes) == 1: - printer.print_config("Running one %s" % port_obj.driver_name()) - else: - printer.print_config("Running %s %ss in parallel" % ( - options.child_processes, port_obj.driver_name())) - - # Include all tests if none are specified. - new_args = [] - for arg in args: - if arg and arg != '': - new_args.append(arg) - - paths = new_args - if not paths: - paths = [] - paths += last_unexpected_results - if options.test_list: - paths += read_test_files(options.test_list) - - # Create the output directory if it doesn't already exist. - port_obj.maybe_make_directory(options.results_directory) - printer.print_update("Collecting tests ...") - - test_runner = TestRunner(port_obj, options, printer) - test_runner.gather_file_paths(paths) - - if options.lint_test_files: - # Creating the expecations for each platform/configuration pair does - # all the test list parsing and ensures it's correct syntax (e.g. no - # dupes). - for platform_name in port_obj.test_platform_names(): - test_runner.parse_expectations(platform_name, is_debug_mode=True) - test_runner.parse_expectations(platform_name, is_debug_mode=False) - printer.write("") - _log.info("If there are no fail messages, errors or exceptions, " - "then the lint succeeded.") - return 0 - - printer.print_config("Using port '%s'" % port_obj.name()) - printer.print_config("Placing test results in %s" % - options.results_directory) - if options.new_baseline: - printer.print_config("Placing new baselines in %s" % - port_obj.baseline_path()) - printer.print_config("Using %s build" % options.configuration) - if options.pixel_tests: - printer.print_config("Pixel tests enabled") - else: - printer.print_config("Pixel tests disabled") - printer.print_config("") - - printer.print_update("Parsing expectations ...") - test_runner.parse_expectations(port_obj.test_platform_name(), - options.configuration == 'Debug') - - printer.print_update("Checking build ...") - if not port_obj.check_build(test_runner.needs_http()): - return -1 - - printer.print_update("Starting helper ...") - port_obj.start_helper() - - # Check that the system dependencies (themes, fonts, ...) are correct. - if not options.nocheck_sys_deps: - printer.print_update("Checking system dependencies ...") - if not port_obj.check_sys_deps(test_runner.needs_http()): - return -1 - - printer.print_update("Preparing tests ...") - result_summary = test_runner.prepare_lists_and_print_output() - - port_obj.setup_test_run() - - test_runner.add_test_type(text_diff.TestTextDiff) - if options.pixel_tests: - test_runner.add_test_type(image_diff.ImageDiff) - num_unexpected_results = test_runner.run(result_summary) - port_obj.stop_helper() - - _log.debug("Exit status: %d" % num_unexpected_results) - return num_unexpected_results +def _gather_unexpected_results(options): + """Returns the unexpected results from the previous run, if any.""" + last_unexpected_results = [] + if options.print_last_failures or options.retest_last_failures: + unexpected_results_filename = os.path.join( + options.results_directory, "unexpected_results.json") + with codecs.open(unexpected_results_filename, "r", "utf-8") as file: + results = simplejson.load(file) + last_unexpected_results = results['tests'].keys() + return last_unexpected_results def _compat_shim_callback(option, opt_str, value, parser): @@ -1597,7 +1628,7 @@ def parse_args(args=None): # Restart DumpRenderTree every n tests (default: 1000) optparse.make_option("--batch-size", help=("Run a the tests in batches (n), after every n tests, " - "DumpRenderTree is relaunched.")), + "DumpRenderTree is relaunched."), type="int", default=0), # old-run-webkit-tests calls --run-singly: -1|--singly # Isolate each test case run (implies --nthly 1 --verbose) optparse.make_option("--run-singly", action="store_true", diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py index 3a3b14e..4cbfdfc 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py @@ -41,6 +41,7 @@ import threading import unittest from webkitpy.common import array_stream +from webkitpy.common.system import outputcapture from webkitpy.layout_tests import port from webkitpy.layout_tests import run_webkit_tests from webkitpy.layout_tests.layout_package import dump_render_tree_thread @@ -48,75 +49,139 @@ from webkitpy.layout_tests.layout_package import dump_render_tree_thread from webkitpy.thirdparty.mock import Mock -def passing_run(args, port_obj=None, record_results=False, +def passing_run(args=[], port_obj=None, record_results=False, tests_included=False): - args.extend(['--print', 'nothing']) + new_args = ['--print', 'nothing'] + if not '--platform' in args: + new_args.extend(['--platform', 'test']) + if not record_results: + new_args.append('--no-record-results') + new_args.extend(args) if not tests_included: # We use the glob to test that globbing works. - args.extend(['passes', 'failures/expected/*']) - if not record_results: - args.append('--no-record-results') - options, args = run_webkit_tests.parse_args(args) + new_args.extend(['passes', 'failures/expected/*']) + options, parsed_args = run_webkit_tests.parse_args(new_args) if port_obj is None: port_obj = port.get(options.platform, options) - res = run_webkit_tests.run(port_obj, options, args) + res = run_webkit_tests.run(port_obj, options, parsed_args) return res == 0 -def logging_run(args, tests_included=False): - args.extend(['--no-record-results']) +def logging_run(args=[], tests_included=False): + new_args = ['--no-record-results'] + if not '--platform' in args: + new_args.extend(['--platform', 'test']) + if args: + new_args.extend(args) if not tests_included: - args.extend(['passes', 'failures/expected/*']) - options, args = run_webkit_tests.parse_args(args) + new_args.extend(['passes', 'failures/expected/*']) + options, parsed_args = run_webkit_tests.parse_args(new_args) port_obj = port.get(options.platform, options) buildbot_output = array_stream.ArrayStream() regular_output = array_stream.ArrayStream() - res = run_webkit_tests.run(port_obj, options, args, + res = run_webkit_tests.run(port_obj, options, parsed_args, buildbot_output=buildbot_output, regular_output=regular_output) return (res, buildbot_output, regular_output) class MainTest(unittest.TestCase): - def test_fast(self): - self.assertTrue(passing_run(['--platform', 'test'])) - self.assertTrue(passing_run(['--platform', 'test', '--run-singly'])) - self.assertTrue(passing_run(['--platform', 'test', - 'passes/text.html'], tests_included=True)) + def test_basic(self): + self.assertTrue(passing_run()) - def test_unexpected_failures(self): - # Run tests including the unexpected failures. - self.assertFalse(passing_run(['--platform', 'test'], - tests_included=True)) + def test_batch_size(self): + # FIXME: verify # of tests run + self.assertTrue(passing_run(['--batch-size', '2'])) - def test_one_child_process(self): + def test_child_process_1(self): (res, buildbot_output, regular_output) = logging_run( - ['--platform', 'test', '--print', 'config', '--child-processes', - '1']) + ['--print', 'config', '--child-processes', '1']) self.assertTrue('Running one DumpRenderTree\n' in regular_output.get()) - def test_two_child_processes(self): + def test_child_processes_2(self): (res, buildbot_output, regular_output) = logging_run( - ['--platform', 'test', '--print', 'config', '--child-processes', - '2']) + ['--print', 'config', '--child-processes', '2']) self.assertTrue('Running 2 DumpRenderTrees in parallel\n' in regular_output.get()) + def test_exception_raised(self): + self.assertRaises(ValueError, logging_run, + ['failures/expected/exception.html'], tests_included=True) + + def test_full_results_html(self): + # FIXME: verify html? + self.assertTrue(passing_run(['--full-results-html'])) + + def test_help_printing(self): + res, out, err = logging_run(['--help-printing']) + self.assertEqual(res, 0) + self.assertTrue(out.empty()) + self.assertFalse(err.empty()) + + def test_keyboard_interrupt(self): + # Note that this also tests running a test marked as SKIP if + # you specify it explicitly. + self.assertRaises(KeyboardInterrupt, passing_run, + ['failures/expected/keyboard.html'], tests_included=True) + def test_last_results(self): - passing_run(['--platform', 'test'], record_results=True) + passing_run(['--clobber-old-results'], record_results=True) (res, buildbot_output, regular_output) = logging_run( - ['--platform', 'test', '--print-last-failures']) + ['--print-last-failures']) self.assertEqual(regular_output.get(), ['\n\n']) self.assertEqual(buildbot_output.get(), []) + def test_lint_test_files(self): + # FIXME: add errors? + res, out, err = logging_run(['--lint-test-files'], tests_included=True) + self.assertEqual(res, 0) + self.assertTrue(out.empty()) + self.assertTrue(any(['lint succeeded' in msg for msg in err.get()])) + def test_no_tests_found(self): - self.assertRaises(SystemExit, logging_run, - ['--platform', 'test', 'resources'], - tests_included=True) - self.assertRaises(SystemExit, logging_run, - ['--platform', 'test', 'foo'], - tests_included=True) + res, out, err = logging_run(['resources'], tests_included=True) + self.assertEqual(res, -1) + self.assertTrue(out.empty()) + self.assertTrue('No tests to run.\n' in err.get()) + + def test_no_tests_found_2(self): + res, out, err = logging_run(['foo'], tests_included=True) + self.assertEqual(res, -1) + self.assertTrue(out.empty()) + self.assertTrue('No tests to run.\n' in err.get()) + + def test_randomize_order(self): + # FIXME: verify order was shuffled + self.assertTrue(passing_run(['--randomize-order'])) + + def test_run_chunk(self): + # FIXME: verify # of tests run + self.assertTrue(passing_run(['--run-chunk', '1:4'])) + + def test_run_force(self): + # This raises an exception because we run + # failures/expected/exception.html, which is normally SKIPped. + self.assertRaises(ValueError, logging_run, ['--force']) + + def test_run_part(self): + # FIXME: verify # of tests run + self.assertTrue(passing_run(['--run-part', '1:2'])) + + def test_run_singly(self): + self.assertTrue(passing_run(['--run-singly'])) + + def test_single_file(self): + # FIXME: verify # of tests run + self.assertTrue(passing_run(['passes/text.html'], tests_included=True)) + + def test_unexpected_failures(self): + # Run tests including the unexpected failures. + res, out, err = logging_run(tests_included=True) + self.assertEqual(res, 1) + self.assertFalse(out.empty()) + self.assertFalse(err.empty()) + def _mocked_open(original_open, file_list): def _wrapper(name, mode, encoding): @@ -144,7 +209,7 @@ class RebaselineTest(unittest.TestCase): # is missing, update the expected generic location. file_list = [] codecs.open = _mocked_open(original_open, file_list) - passing_run(['--platform', 'test', '--pixel-tests', + passing_run(['--pixel-tests', '--reset-results', 'passes/image.html', 'failures/expected/missing_image.html'], @@ -165,7 +230,7 @@ class RebaselineTest(unittest.TestCase): # is mssing, then create a new expectation in the platform dir. file_list = [] codecs.open = _mocked_open(original_open, file_list) - passing_run(['--platform', 'test', '--pixel-tests', + passing_run(['--pixel-tests', '--new-baseline', 'passes/image.html', 'failures/expected/missing_image.html'], @@ -208,6 +273,7 @@ class DryrunTest(unittest.TestCase): if sys.platform != "darwin": return + self.assertTrue(passing_run(['--platform', 'test'])) self.assertTrue(passing_run(['--platform', 'dryrun', 'fast/html'])) self.assertTrue(passing_run(['--platform', 'dryrun-mac', @@ -223,6 +289,11 @@ class TestThread(dump_render_tree_thread.WatchableThread): self._timeout_queue = Queue.Queue() def run(self): + self._covered_run() + + def _covered_run(self): + # FIXME: this is a separate routine to work around a bug + # in coverage: see http://bitbucket.org/ned/coveragepy/issue/85. self._thread_id = thread.get_ident() try: self._started_queue.put('') @@ -284,8 +355,11 @@ class WaitForThreadsToFinishTest(unittest.TestCase): self.assertTrue(interrupted) def test_timeout(self): + oc = outputcapture.OutputCapture() + oc.capture_output() interrupted = self.run_one_thread('Timeout') self.assertFalse(interrupted) + oc.restore_output() def test_exception(self): self.assertRaises(ValueError, self.run_one_thread, 'Exception') @@ -293,6 +367,8 @@ class WaitForThreadsToFinishTest(unittest.TestCase): class StandaloneFunctionsTest(unittest.TestCase): def test_log_wedged_thread(self): + oc = outputcapture.OutputCapture() + oc.capture_output() logger = run_webkit_tests._log astream = array_stream.ArrayStream() handler = TestHandler(astream) @@ -310,6 +386,7 @@ class StandaloneFunctionsTest(unittest.TestCase): self.assertFalse(astream.empty()) self.assertFalse(child_thread.isAlive()) + oc.restore_output() def test_find_thread_stack(self): id, stack = sys._current_frames().items()[0] diff --git a/WebKitTools/Scripts/webkitpy/style/checker.py b/WebKitTools/Scripts/webkitpy/style/checker.py index ee33003..f8eefa4 100644 --- a/WebKitTools/Scripts/webkitpy/style/checker.py +++ b/WebKitTools/Scripts/webkitpy/style/checker.py @@ -212,6 +212,10 @@ _SKIPPED_FILES_WITH_WARNING = [ "WebKit/qt/Api/", "WebKit/qt/tests/", "WebKit/qt/examples/", + # Soup API that is still being cooked, will be removed from WebKit + # in a few months when it is merged into soup proper. The style + # follows the libsoup style completely. + "WebCore/platform/network/soup/cache/", ] diff --git a/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py b/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py index c0bb4ac..747b8b4 100644 --- a/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py +++ b/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py @@ -93,7 +93,7 @@ class TestExpectationsTestCase(unittest.TestCase): ["passes/text.html = CRASH TIMEOUT FAIL PASS"], "") self.assert_lines_lint( - ["BUG1234 TEST : passes/text.html = PASS FAIL"], + ["BUG1234 MAC : passes/text.html = PASS FAIL"], "") self.assert_lines_lint( ["SKIP BUG1234 : passes/text.html = TIMEOUT PASS"], @@ -105,10 +105,10 @@ class TestExpectationsTestCase(unittest.TestCase): ["BUG1234 DEBUG SKIP : passes/text.html = TIMEOUT PASS"], "") self.assert_lines_lint( - ["BUG1234 TEST DEBUG SKIP : passes/text.html = TIMEOUT PASS"], + ["BUG1234 MAC DEBUG SKIP : passes/text.html = TIMEOUT PASS"], "") self.assert_lines_lint( - ["BUG1234 DEBUG TEST : passes/text.html = TIMEOUT PASS"], + ["BUG1234 DEBUG MAC : passes/text.html = TIMEOUT PASS"], "") self.assert_lines_lint( ["SLOW DEFER BUG1234 : passes/text.html = PASS"], diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py index 432a877..86e2e15 100644 --- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py +++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py @@ -109,6 +109,16 @@ class GtkEWS(AbstractEarlyWarningSystem): ] +class EflEWS(AbstractEarlyWarningSystem): + name = "efl-ews" + port_name = "efl" + watchers = AbstractEarlyWarningSystem.watchers + [ + "leandro@profusion.mobi", + "antognolli@profusion.mobi", + "lucas.demarchi@profusion.mobi", + ] + + class QtEWS(AbstractEarlyWarningSystem): name = "qt-ews" port_name = "qt" diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py index 67393d8..1f04923 100644 --- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py +++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py @@ -75,6 +75,9 @@ class EarlyWarningSytemTest(QueuesTest): def test_gtk_ews(self): self._test_ews(GtkEWS()) + def test_efl_ews(self): + self._test_ews(EflEWS()) + def test_mac_ews(self): ews = MacEWS() expected_stderr = self._default_expected_stderr(ews) diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py index d729d98..f86e9a2 100644 --- a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py +++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py @@ -141,7 +141,7 @@ class CommitQueueTest(QueuesTest): # FIXME: The commit-queue warns about bad committers twice. This is due to the fact that we access Attachment.reviewer() twice and it logs each time. "next_work_item" : """Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com) Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com) -MOCK setting flag 'commit-queue' to '-' on attachment '128' with comment 'Rejecting patch 128 from commit-queue.' and additional comment 'non-committer@example.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py.\n\n- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.\n\n- If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your committer rights.' +MOCK setting flag 'commit-queue' to '-' on attachment '128' with comment 'Rejecting patch 128 from commit-queue.' and additional comment 'non-committer@example.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py.\n\n- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.\n\n- If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights.' MOCK: update_work_items: commit-queue [106, 197] 2 patches in commit-queue [106, 197] """, @@ -164,7 +164,7 @@ MOCK setting flag 'commit-queue' to '-' on attachment '128' with comment 'Reject - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. -- If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your committer rights.' +- If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights.' MOCK: update_work_items: commit-queue [106, 197] 2 patches in commit-queue [106, 197] """, @@ -188,7 +188,7 @@ MOCK setting flag 'commit-queue' to '-' on attachment '128' with comment 'Reject - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. -- If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your committer rights.' +- If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights.' MOCK: update_work_items: commit-queue [106, 197] 2 patches in commit-queue [106, 197] """, |