diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py index dad549a..ce99765 100644 --- a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py +++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py @@ -31,11 +31,11 @@ import unittest import optparse import random -import shutil -import tempfile +from webkitpy.common.system import filesystem_mock from webkitpy.layout_tests.layout_package import json_results_generator from webkitpy.layout_tests.layout_package import test_expectations +from webkitpy.thirdparty.mock import Mock class JSONGeneratorTest(unittest.TestCase): @@ -83,7 +83,9 @@ class JSONGeneratorTest(unittest.TestCase): failed=(test in failed_tests), elapsed_time=test_timings[test]) - generator = json_results_generator.JSONResultsGeneratorBase( + port = Mock() + port._filesystem = filesystem_mock.MockFileSystem() + generator = json_results_generator.JSONResultsGeneratorBase(port, self.builder_name, self.build_name, self.build_number, '', None, # don't fetch past json results archive |