diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Tools/TestResultServer/model/jsonresults_unittest.py | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools/TestResultServer/model/jsonresults_unittest.py')
| -rwxr-xr-x | Tools/TestResultServer/model/jsonresults_unittest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/TestResultServer/model/jsonresults_unittest.py b/Tools/TestResultServer/model/jsonresults_unittest.py index 4d5fa9de9..0e65d0bf2 100755 --- a/Tools/TestResultServer/model/jsonresults_unittest.py +++ b/Tools/TestResultServer/model/jsonresults_unittest.py @@ -127,7 +127,7 @@ class JsonResultsTest(unittest.TestCase): if expected_data: expected_results = self._make_test_json(expected_data) - self.assertEquals(merged_results, expected_results) + self.assertEqual(merged_results, expected_results) else: self.assertFalse(merged_results) @@ -135,7 +135,7 @@ class JsonResultsTest(unittest.TestCase): input_results = self._make_test_json(input_data) expected_results = JSON_RESULTS_TEST_LIST_TEMPLATE.replace("{[TESTDATA_TESTS]}", simplejson.dumps(expected_data, separators=(',', ':'))) actual_results = JsonResults.get_test_list(self._builder, input_results) - self.assertEquals(actual_results, expected_results) + self.assertEqual(actual_results, expected_results) def test_merge_null_incremental_results(self): # Empty incremental results json. |
