[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kinuko at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit aadee005cb0c91b7abc4e0efab98cd0e92ade2ef
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 05:16:15 2010 +0000

    2010-11-18  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r72357.
            http://trac.webkit.org/changeset/72357
            https://bugs.webkit.org/show_bug.cgi?id=49784
    
            It broke test-webkitpy tests since the patch didn't have the
            corresponding test update (Requested by kinuko on #webkit).
    
            * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
            * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72365 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ebaa2d4..ef60fdd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-18  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r72357.
+        http://trac.webkit.org/changeset/72357
+        https://bugs.webkit.org/show_bug.cgi?id=49784
+
+        It broke test-webkitpy tests since the patch didn't have the
+        corresponding test update (Requested by kinuko on #webkit).
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+
 2010-11-18  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py
index b054c5b..101d30b 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py
@@ -129,10 +129,6 @@ class JSONLayoutResultsGenerator(json_results_generator.JSONResultsGeneratorBase
         return self.PASS_RESULT
 
     # override
-    def _get_result_char(self, test_name):
-        return self._get_modifier_char(test_name)
-
-    # override
     def _convert_json_to_current_version(self, results_json):
         archive_version = None
         if self.VERSION_KEY in results_json:
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
index 3484fcd..3267718 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
@@ -303,23 +303,6 @@ class JSONResultsGeneratorBase(object):
 
         return JSONResultsGenerator.PASS_RESULT
 
-    def _get_result_char(self, test_name):
-        """Returns a single char (e.g. SKIP_RESULT, FAIL_RESULT,
-        PASS_RESULT, NO_DATA_RESULT, etc) that indicates the test result
-        for the given test_name.
-        """
-        if test_name not in self._test_results_map:
-            return JSONResultsGenerator.NO_DATA_RESULT
-
-        test_result = self._test_results_map[test_name]
-        if test_result.modifier == TestResult.DISABLED:
-            return JSONResultsGenerator.SKIP_RESULT
-
-        if test_result.failed:
-            return JSONResultsGenerator.FAIL_RESULT
-
-        return JSONResultsGenerator.PASS_RESULT
-
     # FIXME: Callers should use scm.py instead.
     # FIXME: Identify and fix the run-time errors that were observed on Windows
     # chromium buildbot when we had updated this code to use scm.py once before.
@@ -501,7 +484,7 @@ class JSONResultsGeneratorBase(object):
           tests: Dictionary containing test result entries.
         """
 
-        result = self._get_result_char(test_name)
+        result = self._get_modifier_char(test_name)
         time = self._get_test_timing(test_name)
 
         if test_name not in tests:

-- 
WebKit Debian packaging