diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
| commit | 6dbcd09121fe266c7704a524b5cbd7f2754659c0 (patch) | |
| tree | 5ae0d16cec0cc61f576d51c57b3a4613c7e91e22 /Tools/Scripts/webkitpy/tool/commands/queries_unittest.py | |
| parent | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (diff) | |
| download | qtwebkit-6dbcd09121fe266c7704a524b5cbd7f2754659c0.tar.gz | |
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)
New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/commands/queries_unittest.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/tool/commands/queries_unittest.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py b/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py index 115249916..1da17e48b 100644 --- a/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py +++ b/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py @@ -178,35 +178,35 @@ class PrintExpectationsTest(unittest.TestCase): def test_basic(self): self.run_test(['failures/expected/text.html', 'failures/expected/image.html'], ('// For test-win-xp\n' - 'failures/expected/image.html = IMAGE\n' - 'failures/expected/text.html = TEXT\n')) + 'failures/expected/image.html [ ImageOnlyFailure WontFix ]\n' + 'failures/expected/text.html [ Failure WontFix ]\n')) def test_multiple(self): self.run_test(['failures/expected/text.html', 'failures/expected/image.html'], ('// For test-win-vista\n' - 'failures/expected/image.html = IMAGE\n' - 'failures/expected/text.html = TEXT\n' + 'failures/expected/image.html [ ImageOnlyFailure WontFix ]\n' + 'failures/expected/text.html [ Failure WontFix ]\n' '\n' '// For test-win-win7\n' - 'failures/expected/image.html = IMAGE\n' - 'failures/expected/text.html = TEXT\n' + 'failures/expected/image.html [ ImageOnlyFailure WontFix ]\n' + 'failures/expected/text.html [ Failure WontFix ]\n' '\n' '// For test-win-xp\n' - 'failures/expected/image.html = IMAGE\n' - 'failures/expected/text.html = TEXT\n'), + 'failures/expected/image.html [ ImageOnlyFailure WontFix ]\n' + 'failures/expected/text.html [ Failure WontFix ]\n'), platform='test-win-*') def test_full(self): self.run_test(['failures/expected/text.html', 'failures/expected/image.html'], ('// For test-win-xp\n' - 'WONTFIX : failures/expected/image.html = IMAGE\n' - 'WONTFIX : failures/expected/text.html = TEXT\n'), + 'failures/expected/image.html [ ImageOnlyFailure WontFix ]\n' + 'failures/expected/text.html [ Failure WontFix ]\n'), full=True) def test_exclude(self): self.run_test(['failures/expected/text.html', 'failures/expected/image.html'], ('// For test-win-xp\n' - 'failures/expected/text.html = TEXT\n'), + 'failures/expected/text.html [ Failure WontFix ]\n'), exclude_keyword=['image']) def test_include(self): @@ -218,7 +218,7 @@ class PrintExpectationsTest(unittest.TestCase): def test_csv(self): self.run_test(['failures/expected/text.html', 'failures/expected/image.html'], ('test-win-xp,failures/expected/image.html,WONTFIX,IMAGE\n' - 'test-win-xp,failures/expected/text.html,WONTFIX,TEXT\n'), + 'test-win-xp,failures/expected/text.html,WONTFIX,FAIL\n'), csv=True) |