remove support for chromium vista from tools

https://bugs.webkit.org/show_bug.cgi?id=89915

Reviewed by Tony Chang.

Tools:

This change is all deleting code and updating tests to handle
the configuration being gone. All tests now pass except for a
few unittests for the flakiness dashboard which were failing
before this patch.

* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
* Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
(BaselineOptimizerTest.test_complex_shadowing):
* Scripts/webkitpy/layout_tests/port/builders.py:
* Scripts/webkitpy/layout_tests/port/chromium.py:
* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
(ChromiumWinPort):
* Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
(ChromiumWinTest.test_versions):
(ChromiumWinTest.test_baseline_path):
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
* Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
(BuildCoverageExtrapolatorTest.test_extrapolate):

LayoutTests:

* platform/chromium/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b460c0d..8a1012f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-25  Dirk Pranke  <dpranke@chromium.org>
+
+        remove support for chromium vista from tools
+        https://bugs.webkit.org/show_bug.cgi?id=89915
+
+        Reviewed by Tony Chang.
+
+        * platform/chromium/TestExpectations:
+
 2012-06-25  Alpha Lam  <hclam@chromium.org>
 
         Unreviewed. Build fix.

diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
index 4e4aaa3..34c40b6 100644 (file)
--- a/LayoutTests/platform/chromium/TestExpectations
+++ b/LayoutTests/platform/chromium/TestExpectations
@@ -1023,7 +1023,6 @@ BUGWK55560 : editing/input/setting-input-value-cancel-ime-composition.html = TEX
 
 // New test added in r82159
 BUGCR77706 LINUX XP WIN7 SNOWLEOPARD LION : editing/spelling/grammar.html = TEXT
-BUGCR77706 VISTA SLOW : editing/spelling/grammar.html = TEXT
 
 // Needs grammar checking.
 BUGWK71792 : editing/spelling/markers.html = TEXT
@@ -1893,7 +1892,7 @@ BUGCR42696 : http/tests/xmlhttprequest/cross-origin-authorization-with-embedder.
 
 // WebKit roll 58304:58400
 BUGUKAI MAC : fast/text/international/bold-bengali.html = IMAGE
-BUGUKAI VISTA WIN7 : fast/text/international/bold-bengali.html = IMAGE+TEXT
+BUGUKAI WIN7 : fast/text/international/bold-bengali.html = IMAGE+TEXT
 
 // These 5,000+ tests are already being run by the V8 team (and have no chromium expectations).
 // They should be moved to the JavaScriptCore test suite.
@@ -2116,10 +2115,6 @@ BUGWK45652 : fast/viewport/viewport-126.html = MISSING
 BUGWK45652 : fast/viewport/viewport-127.html = MISSING
 BUGWK45652 : fast/viewport/viewport-128.html = TIMEOUT TEXT
 BUGWK45652 : fast/viewport/viewport-129.html = TIMEOUT MISSING TEXT
-BUGWK87757 VISTA : fast/viewport/viewport-130.html = TIMEOUT TEXT
-BUGWK87757 VISTA : fast/viewport/viewport-131.html = TIMEOUT TEXT
-BUGWK87757 VISTA : fast/viewport/viewport-132.html = TIMEOUT TEXT
-BUGWK87757 VISTA : fast/viewport/viewport-legacy-xhtmlmp-misplaced-doctype.html = TIMEOUT TEXT
 BUGWK45652 : fast/viewport/scroll-delegates-switch-on-page-with-no-composition-mode-asserts.html = PASS
 
 BUGWK45737 BUGCR100056 DEBUG : fast/frames/frame-limit.html = TIMEOUT
@@ -2672,7 +2667,7 @@ BUGWK60822 : plugins/get-url-with-javascript-url.html = TIMEOUT
 BUGWK60822 : plugins/get-url-notify-with-url-that-fails-to-load.html = CRASH
 
 // Flaky since added by r86478
-BUGCR82881 LINUX MAC VISTA XP : http/tests/appcache/interrupted-update.html = PASS TEXT
+BUGCR82881 LINUX MAC XP : http/tests/appcache/interrupted-update.html = PASS TEXT
 
 // Fails on windows - added in r86693
 BUGCR82950 WIN : http/tests/navigation/post-301-response.html = TEXT
@@ -2700,8 +2695,6 @@ BUGCR83994 WIN : platform/win/plugins/call-javascript-that-destroys-plugin.html
 
 BUGCR84032 WIN : fast/dom/object-plugin-hides-properties.html = PASS TIMEOUT
 
-BUGCR84093 VISTA : http/tests/history/redirect-200-refresh-2-seconds.pl = PASS TIMEOUT
-
 BUGWK62255 LEOPARD DEBUG : animations/animation-iteration-event-destroy-renderer.html = PASS TIMEOUT
 
 BUGCR85292 : platform/chromium/permissionclient/storage-permission.html = PASS TEXT
@@ -2772,8 +2765,6 @@ BUGCR87732 : fast/regex/toString.html = TEXT
 // Test fails because it's trying to load a plugin we don't have. We probably don't need to fix this.
 BUGJAPHET : platform/gtk/plugins/invalidate-rect-with-null-npp-argument.html = TEXT
 
-BUGCR88230 VISTA : fast/dom/dom-parse-serialize-display.html = PASS TIMEOUT
-
 // Started around WebKit r90233:r90242
 BUGWK64000 DEBUG : fast/events/click-focus-anchor.html = PASS TEXT
 
@@ -3493,16 +3484,12 @@ BUGWK84689 SNOWLEOPARD : fast/images/embed-does-not-propagate-dimensions-to-obje
 
 BUGWK84696 SNOWLEOPARD : fast/workers/storage/interrupt-database.html = TIMEOUT PASS
 
-BUGWK84712 VISTA : http/tests/inspector/network/x-frame-options-deny.html = TIMEOUT PASS
-
 BUGWK84714 SNOWLEOPARD : compositing/geometry/empty-embed-rects.html = TIMEOUT PASS
 
 BUGWK84720 DEBUG : fast/repaint/fixed-right-in-page-scale.html = IMAGE PASS
 
 BUGWK84724 SNOWLEOPARD : platform/chromium/media/video-frame-size-change.html = IMAGE PASS
 
-BUGWK84733 VISTA : fast/canvas/canvas-composite.html = TIMEOUT PASS
-
 BUGWK84735 WIN : http/tests/inspector/change-iframe-src.html = TIMEOUT PASS
 
 BUGWK84802 DEBUG SLOW : fast/js/random-array-gc-stress.html = PASS
@@ -3625,11 +3612,7 @@ BUGWK86908 WIN : http/tests/security/cross-frame-access-put.html = PASS TEXT
 
 BUGWK86909 WIN SLOW : compositing/geometry/object-clip-rects-assertion.html = PASS
 BUGWK86909 WIN : http/tests/inspector/appcache/appcache-iframe-manifests.html = PASS TIMEOUT
-BUGWK86909 VISTA SLOW : http/tests/inspector/network/async-xhr-json-mime-type.html = PASS
-BUGWK86909 VISTA SLOW : http/tests/inspector/network/network-cachedresources-with-same-urls.html = PASS
 BUGWK86909 WIN : http/tests/inspector/network/network-content-replacement-xhr.html = PASS TIMEOUT
-BUGWK86909 VISTA SLOW : http/tests/security/escape-form-data-field-names.html = PASS
-BUGWK86909 VISTA SLOW : http/tests/security/feed-urls-from-remote.html = PASS
 BUGWK86909 WIN DEBUG : http/tests/security/referrer-policy-redirect-link.html = PASS TIMEOUT
 BUGWK86909 WIN DEBUG : platform/chromium/virtual/gpu/fast/canvas/imagedata-contains-uint8clampedarray.html = PASS TIMEOUT
 BUGWK86909 WIN SLOW : platform/chromium/virtual/gpu/fast/canvas/webgl/webgl-composite-modes-repaint.html = PASS

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js
index 7e0f38d..673c14e 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js
@@ -648,7 +648,7 @@ var kExampleBuildInfoWithTaskKillWarning = {
         "expectations": [["output",1776,1534.0625014267862]],
         "isFinished": true,
         "isStarted": true,
-        "logs": [["stdio","http://build.chromium.org/p/chromium.webkitbuilders/Vista%20Perf/builds/10268/steps/taskkill/logs/stdio"]],
+        "logs": [["stdio","http://build.chromium.org/p/chromium.webkitbuilders/XP%20Perf/builds/10268/steps/taskkill/logs/stdio"]],
         "name": "taskkill",
         "results": [1,[]],
         "statistics": {},

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js
index cca7cf8..4721ba3 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js
@@ -88,7 +88,7 @@ test("rebaseline", 4, function() {
             'testName': 'another/test.svg',
             'failureTypeList': ['IMAGE', 'TEXT', 'IMAGE+TEXT'],
         }, {
-            'builderName': 'Webkit Vista',
+            'builderName': 'Webkit Win7',
             'testName': 'fast/test.html',
             'failureTypeList': ['IMAGE+TEXT'],
         }], function() {
@@ -107,7 +107,7 @@ test("rebaseline", 4, function() {
                  "WebKit Linux": ["png"], 
                  "WebKit Mac10.6": ["png","txt"]},
              "fast/test.html": {
-                 "Webkit Vista": ["txt","png"]
+                 "Webkit Win7": ["txt","png"]
              }})]
     ]);
 });

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js
index 40097dc..402c12b 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js
@@ -58,7 +58,6 @@ config.kPlatforms = {
         waterfallURL: 'http://build.chromium.org/p/chromium.webkit/waterfall',
         builders: {
             'Webkit Win': {version: 'xp'},
-            'Webkit Vista': {version: 'vista'},
             'Webkit Win7': {version: 'win7'},
             'Webkit Win (dbg)(1)': {version: 'xp', debug: true},
             'Webkit Win (dbg)(2)': {version: 'xp', debug: true},

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
index cfd9dff..a99a7aa 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
@@ -318,7 +318,7 @@ test('FailingTestsSummary (grouping)', 1, function() {
 
 test('BuildersFailing', 1, function() {
     var builderFailing = new ui.notifications.BuildersFailing('Disasterifying');
-    builderFailing.setFailingBuilders({'Webkit Linux': ['compile'], 'Webkit Vista': ['webkit_tests', 'update']});
+    builderFailing.setFailingBuilders({'Webkit Linux': ['compile'], 'Webkit Win7': ['webkit_tests', 'update']});
     equal(builderFailing.innerHTML,
         '<div class="how">' +
             '<time class="relative"></time>' +
@@ -327,7 +327,7 @@ test('BuildersFailing', 1, function() {
             '<div class="problem">Disasterifying:' +
                 '<ul class="effects">' +
                     '<li class="builder"><a class="failing-builder" target="_blank" href="http://build.chromium.org/p/chromium.webkit/waterfall?builder=Webkit+Linux"><span class="version">lucid</span><span class="architecture">64-bit</span></a></li>' +
-                    '<li class="builder"><a class="failing-builder" target="_blank" href="http://build.chromium.org/p/chromium.webkit/waterfall?builder=Webkit+Vista"><span class="version">vista</span></a></li>' +
+                    '<li class="builder"><a class="failing-builder" target="_blank" href="http://build.chromium.org/p/chromium.webkit/waterfall?builder=Webkit+Win7"><span class="version">win7</span></a></li>' +
                 '</ul>' +
             '</div>' +
             '<ul class="causes"></ul>' +

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1937a7d..349f379 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,33 @@
+2012-06-25  Dirk Pranke  <dpranke@chromium.org>
+
+        remove support for chromium vista from tools
+        https://bugs.webkit.org/show_bug.cgi?id=89915
+
+        Reviewed by Tony Chang.
+
+        This change is all deleting code and updating tests to handle
+        the configuration being gone. All tests now pass except for a
+        few unittests for the flakiness dashboard which were failing
+        before this patch.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
+        * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
+        (BaselineOptimizerTest.test_complex_shadowing):
+        * Scripts/webkitpy/layout_tests/port/builders.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+        (ChromiumWinPort):
+        * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+        (ChromiumWinTest.test_versions):
+        (ChromiumWinTest.test_baseline_path):
+        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+        (BuildCoverageExtrapolatorTest.test_extrapolate):
+
 2012-06-25  Scott Graham  <scottmg@chromium.org>
 
         [Chromium] add empty impl of WebThemeEngine::getSize() for DRT

diff --git a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
index b70e5d0..414cc06 100644 (file)
--- a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
+++ b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
@@ -155,7 +155,7 @@ class BaselineOptimizerTest(unittest.TestCase):
             'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
             'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
             'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
-            'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
+            'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
             'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
             'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036',
         }, {
@@ -164,7 +164,7 @@ class BaselineOptimizerTest(unittest.TestCase):
             'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
             'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
             'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
-            'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
+            'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
             'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
             'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036'
         })

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/builders.py b/Tools/Scripts/webkitpy/layout_tests/port/builders.py
index cc0fa69..3ad45be 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/builders.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/builders.py
@@ -38,7 +38,6 @@ from webkitpy.common.memoized import memoized
 _exact_matches = {
     # These builders are on build.chromium.org.
     "Webkit Win": {"port_name": "chromium-win-xp", "specifiers": set(["xp", "release"])},
-    "Webkit Vista": {"port_name": "chromium-win-vista", "specifiers": set(["vista"])},
     "Webkit Win7": {"port_name": "chromium-win-win7", "specifiers": set(["win7"])},
     "Webkit Win (dbg)(1)": {"port_name": "chromium-win-xp", "specifiers": set(["win", "debug"])},
     "Webkit Win (dbg)(2)": {"port_name": "chromium-win-xp", "specifiers": set(["win", "debug"])},

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
index b510305..5aad94c 100755 (executable)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -56,7 +56,6 @@ class ChromiumPort(Port):
         ('snowleopard', 'x86'),
         ('lion', 'x86'),
         ('xp', 'x86'),
-        ('vista', 'x86'),
         ('win7', 'x86'),
         ('lucid', 'x86'),
         ('lucid', 'x86_64'),
@@ -66,13 +65,13 @@ class ChromiumPort(Port):
 
     ALL_BASELINE_VARIANTS = [
         'chromium-mac-lion', 'chromium-mac-snowleopard', 'chromium-mac-leopard',
-        'chromium-win-win7', 'chromium-win-vista', 'chromium-win-xp',
+        'chromium-win-win7', 'chromium-win-xp',
         'chromium-linux-x86_64', 'chromium-linux-x86',
     ]
 
     CONFIGURATION_SPECIFIER_MACROS = {
         'mac': ['leopard', 'snowleopard', 'lion'],
-        'win': ['xp', 'vista', 'win7'],
+        'win': ['xp', 'win7'],
         'linux': ['lucid'],
         'android': ['icecreamsandwich'],
     }

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
index 532843a..492deed 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
@@ -194,8 +194,6 @@ class ChromiumPortTest(port_testcase.PortTestCase):
             TestConfiguration('lion', 'x86', 'release'),
             TestConfiguration('xp', 'x86', 'debug'),
             TestConfiguration('xp', 'x86', 'release'),
-            TestConfiguration('vista', 'x86', 'debug'),
-            TestConfiguration('vista', 'x86', 'release'),
             TestConfiguration('win7', 'x86', 'debug'),
             TestConfiguration('win7', 'x86', 'release'),
             TestConfiguration('lucid', 'x86', 'debug'),

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
index b76f7ee..01cdbce 100755 (executable)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
@@ -42,19 +42,12 @@ class ChromiumWinPort(chromium.ChromiumPort):
     port_name = 'chromium-win'
 
     # FIXME: Figure out how to unify this with base.TestConfiguration.all_systems()?
-    SUPPORTED_VERSIONS = ('xp', 'vista', 'win7')
+    SUPPORTED_VERSIONS = ('xp', 'win7')
 
     # FIXME: Do we need mac-snowleopard here, like the base win port?
     FALLBACK_PATHS = {
         'xp': [
             'chromium-win-xp',
-            'chromium-win-vista',
-            'chromium-win',
-            'chromium',
-            'mac',
-        ],
-        'vista': [
-            'chromium-win-vista',
             'chromium-win',
             'chromium',
             'mac',

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
index 759bc7e..f5d9e4d 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
@@ -74,24 +74,16 @@ class ChromiumWinTest(port_testcase.PortTestCase):
 
     def test_versions(self):
         port = self.make_port()
-        self.assertTrue(port.name() in ('chromium-win-xp', 'chromium-win-vista', 'chromium-win-win7'))
+        self.assertTrue(port.name() in ('chromium-win-xp', 'chromium-win-win7'))
 
         self.assert_name(None, 'xp', 'chromium-win-xp')
         self.assert_name('chromium-win', 'xp', 'chromium-win-xp')
         self.assert_name('chromium-win-xp', 'xp', 'chromium-win-xp')
-        self.assert_name('chromium-win-xp', 'vista', 'chromium-win-xp')
         self.assert_name('chromium-win-xp', '7sp0', 'chromium-win-xp')
 
-        self.assert_name(None, 'vista', 'chromium-win-vista')
-        self.assert_name('chromium-win', 'vista', 'chromium-win-vista')
-        self.assert_name('chromium-win-vista', 'xp', 'chromium-win-vista')
-        self.assert_name('chromium-win-vista', 'vista', 'chromium-win-vista')
-        self.assert_name('chromium-win-vista', '7sp0', 'chromium-win-vista')
-
         self.assert_name(None, '7sp0', 'chromium-win-win7')
         self.assert_name('chromium-win', '7sp0', 'chromium-win-win7')
         self.assert_name('chromium-win-win7', 'xp', 'chromium-win-win7')
-        self.assert_name('chromium-win-win7', 'vista', 'chromium-win-win7')
         self.assert_name('chromium-win-win7', '7sp0', 'chromium-win-win7')
 
         self.assertRaises(AssertionError, self.assert_name, None, 'w2k', 'chromium-win-xp')
@@ -100,9 +92,6 @@ class ChromiumWinTest(port_testcase.PortTestCase):
         port = self.make_port(port_name='chromium-win-xp')
         self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-win-xp'))
 
-        port = self.make_port(port_name='chromium-win-vista')
-        self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-win-vista'))
-
         port = self.make_port(port_name='chromium-win-win7')
         self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-win'))
 

diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
index b5a043f..84036d4 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
@@ -204,9 +204,6 @@ Retrieving results for chromium-mac-lion from Webkit Mac10.7.
 Retrieving results for chromium-mac-snowleopard from Webkit Mac10.6.
     userscripts/another-test.html (txt)
     userscripts/images.svg (png)
-Retrieving results for chromium-win-vista from Webkit Vista.
-    userscripts/another-test.html (txt)
-    userscripts/images.svg (png)
 Retrieving results for chromium-win-win7 from Webkit Win7.
     userscripts/another-test.html (txt)
     userscripts/images.svg (png)
@@ -225,8 +222,6 @@ MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Mac10
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Mac10.7', 'userscripts/images.svg'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Mac10.6', 'userscripts/images.svg'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Vista', 'userscripts/another-test.html'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Vista', 'userscripts/images.svg'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Win7', 'userscripts/another-test.html'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Win7', 'userscripts/images.svg'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Win', 'userscripts/another-test.html'], cwd=/mock-checkout

diff --git a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
index dcecb50..4cc772c 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
@@ -91,9 +91,9 @@ class BuildCoverageExtrapolatorTest(unittest.TestCase):
         converter = TestConfigurationConverter(port.all_test_configurations(), port.configuration_specifier_macros())
         extrapolator = BuildCoverageExtrapolator(converter)
         self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Win"), set([TestConfiguration(version='xp', architecture='x86', build_type='release')]))
-        self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Vista"), set([
-            TestConfiguration(version='vista', architecture='x86', build_type='debug'),
-            TestConfiguration(version='vista', architecture='x86', build_type='release')]))
+        self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Win7"), set([
+            TestConfiguration(version='win7', architecture='x86', build_type='debug'),
+            TestConfiguration(version='win7', architecture='x86', build_type='release')]))
         self.assertRaises(KeyError, extrapolator.extrapolate_test_configurations, "Potato")