From c15fa8bf25728ccc295b288770331ae97695fec2 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 16 Mar 2016 14:47:26 +0100 Subject: [PATCH 1/2] Use call rather than check_call in jquery_test_runner. The contract for mach commands is to return zero / non-zero to indicate success / failure, rather than throwing an exception. Since run_jquery.py uses a 1 exit code when there are unexpected results, this would cause an exception from check_call, which would then be printed with a stack trace. --- python/servo/testing_commands.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index ddd8cc90918..7d76ad80e65 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -497,8 +497,7 @@ class MachCommands(CommandBase): # Check that a release servo build exists bin_path = path.abspath(self.get_binary_path(release, dev)) - return check_call( - [run_file, cmd, bin_path, base_dir]) + return call([run_file, cmd, bin_path, base_dir]) def dromaeo_test_runner(self, tests, release, dev): self.ensure_bootstrapped() From 773d4a7ee5c8c82b0a90de82b6ab319f51daa730 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 16 Mar 2016 14:48:10 +0100 Subject: [PATCH 2/2] Update expected results for the jquery tests. Apparently four of the attributes tests were fixed at some point. --- tests/jquery/expected_selector.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/jquery/expected_selector.txt b/tests/jquery/expected_selector.txt index eddb132445f..434a4d80ea4 100644 --- a/tests/jquery/expected_selector.txt +++ b/tests/jquery/expected_selector.txt @@ -9,6 +9,6 @@ [jQuery test] [7/0/7] element - jQuery only [jQuery test] [0/2/2] Sizzle cache collides with multiple Sizzles on a page [jQuery test] [1/0/1] disconnected nodes -[jQuery test] [50/4/54] attributes +[jQuery test] [54/0/54] attributes [jQuery test] [3/0/3] disconnected nodes - jQuery only [jQuery test] [26/0/26] id