Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py

Issue 2578213005: Use underscores to separate words in filenames in webkitpy. (Closed)
Patch Set: Fix check for attribute in output_capture.py. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
deleted file mode 100644
index 056e613a49957df82b7fd0e623e1ad8e9af404e7..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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 unittest
-
-from webkitpy.common.net.layouttestresults import LayoutTestResults
-
-
-class LayoutTestResultsTest(unittest.TestCase):
- # The real files have no whitespace, but newlines make this much more readable.
- example_full_results_json = """ADD_RESULTS({
- "tests": {
- "fast": {
- "dom": {
- "prototype-inheritance.html": {
- "expected": "PASS",
- "actual": "TEXT",
- "is_unexpected": true
- },
- "prototype-banana.html": {
- "expected": "FAIL",
- "actual": "PASS",
- "is_unexpected": true
- },
- "prototype-taco.html": {
- "expected": "PASS",
- "actual": "PASS TEXT",
- "is_unexpected": true
- },
- "prototype-chocolate.html": {
- "expected": "FAIL",
- "actual": "IMAGE+TEXT"
- },
- "prototype-strawberry.html": {
- "expected": "PASS",
- "actual": "IMAGE PASS",
- "is_unexpected": true
- },
- "prototype-crashy.html": {
- "expected": "PASS",
- "actual": "CRASH",
- "is_unexpected": true
- },
- "prototype-newtest.html": {
- "expected": "PASS",
- "actual": "MISSING",
- "is_unexpected": true,
- "is_missing_text": true
- }
- }
- },
- "svg": {
- "dynamic-updates": {
- "SVGFEDropShadowElement-dom-stdDeviation-attr.html": {
- "expected": "PASS",
- "actual": "IMAGE",
- "has_stderr": true,
- "is_unexpected": true
- }
- }
- }
- },
- "skipped": 450,
- "num_regressions": 15,
- "layout_tests_dir": "/b/build/slave/Webkit_Mac10_5/build/src/third_party/WebKit/LayoutTests",
- "version": 3,
- "num_passes": 77,
- "has_pretty_patch": false,
- "fixable": 1220,
- "num_flaky": 0,
- "chromium_revision": "1234",
- "has_wdiff": false,
- "builder_name": "mock_builder_name"
-});"""
-
- def test_results_from_string(self):
- self.assertIsNone(LayoutTestResults.results_from_string(None))
- self.assertIsNone(LayoutTestResults.results_from_string(""))
-
- def test_was_interrupted(self):
- self.assertTrue(LayoutTestResults.results_from_string(
- 'ADD_RESULTS({"tests":{},"interrupted":true});').run_was_interrupted())
- self.assertFalse(LayoutTestResults.results_from_string(
- 'ADD_RESULTS({"tests":{},"interrupted":false});').run_was_interrupted())
-
- def test_chromium_revision(self):
- self.assertEqual(LayoutTestResults.results_from_string(self.example_full_results_json).chromium_revision(), 1234)
-
- def test_actual_results(self):
- results = LayoutTestResults.results_from_string(self.example_full_results_json)
- self.assertEqual(results.result_for_test("fast/dom/prototype-banana.html").actual_results(), "PASS")
- self.assertEqual(results.result_for_test("fast/dom/prototype-taco.html").actual_results(), "PASS TEXT")
- self.assertFalse(results.result_for_test("nonexistant.html"))
-
- def test_didnt_run_as_expected_results(self):
- results = LayoutTestResults.results_from_string(self.example_full_results_json)
- self.assertEqual(
- [r.test_name() for r in results.didnt_run_as_expected_results()],
- [
- 'fast/dom/prototype-banana.html',
- 'fast/dom/prototype-crashy.html',
- 'fast/dom/prototype-inheritance.html',
- 'fast/dom/prototype-newtest.html',
- 'fast/dom/prototype-strawberry.html',
- 'fast/dom/prototype-taco.html',
- 'svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html',
- ])

Powered by Google App Engine
This is Rietveld 408576698