[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jparent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 58de278d1d27d435f99737c09d18d2fd0a455bb4
Author: jparent at chromium.org <jparent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 07:31:14 2011 +0000

    2011-01-06  Julie Parent  <jparent at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Test Result Server not removing old results.
            https://bugs.webkit.org/show_bug.cgi?id=52012
    
            * TestResultServer/model/jsonresults.py:
            Fix off-by-one: Truncate if >= num_runs, not just >.
            * TestResultServer/model/jsonresults_unittest.py:
            Add unit test to test that merging in a new result with the same value
            as the last result causes previous result to fall off.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75234 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1b94216..b2c1535 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-06  Julie Parent  <jparent at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Test Result Server not removing old results.
+        https://bugs.webkit.org/show_bug.cgi?id=52012
+
+        * TestResultServer/model/jsonresults.py:
+        Fix off-by-one: Truncate if >= num_runs, not just >.
+        * TestResultServer/model/jsonresults_unittest.py:
+        Add unit test to test that merging in a new result with the same value
+        as the last result causes previous result to fall off.
+
 2011-01-06  James Kozianski  <koz at chromium.org>
 
         Reviewed by Mihai Parparita.
diff --git a/Tools/TestResultServer/model/jsonresults.py b/Tools/TestResultServer/model/jsonresults.py
index 8e507a2..d61a860 100755
--- a/Tools/TestResultServer/model/jsonresults.py
+++ b/Tools/TestResultServer/model/jsonresults.py
@@ -305,7 +305,7 @@ class JsonResults(object):
         for result in encoded_list:
             num_builds = num_builds + result[0]
             index = index + 1
-            if num_builds > num_runs:
+            if num_builds >= num_runs:
                 return encoded_list[:index]
 
         return encoded_list
diff --git a/Tools/TestResultServer/model/jsonresults_unittest.py b/Tools/TestResultServer/model/jsonresults_unittest.py
index 03f1b46..eb8c864 100755
--- a/Tools/TestResultServer/model/jsonresults_unittest.py
+++ b/Tools/TestResultServer/model/jsonresults_unittest.py
@@ -322,6 +322,18 @@ class JsonResultsTest(unittest.TestCase):
             (["3", "2", "1"], [["001.html", "[1,\"T\"],[" + max_builds + ",\"F\"]", "[1,1],[" + max_builds + ",0]"]]),
             int(max_builds))
 
+        # Test that merging in a new result of the same type as the last result
+        # causes old results to fall off.
+        max_builds = str(jsonresults.JSON_RESULTS_MAX_BUILDS_SMALL)
+        self._test_merge(
+            # Aggregated results
+            (["2", "1"], [["001.html", "[" + max_builds + ",\"F\"],[1,\"N\"]", "[" + max_builds + ",0],[1,1]"]]),
+            # Incremental results
+            (["3"], [["001.html", "[1,\"F\"]", "[1,0]"]]),
+            # Expected results
+            (["3", "2", "1"], [["001.html", "[" + max_builds + ",\"F\"]", "[" + max_builds + ",0]"]]),
+            int(max_builds))
+
         # Get test name list only. Don't include non-test-list data and
         # of test result details.
         self._test_get_test_list(

-- 
WebKit Debian packaging