From a8ce441437260fd6e83bc8b30d5edc698a58765e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 5 Aug 2014 02:38:25 +0530 Subject: [PATCH 1/2] Emergency fix for broken tree (mozlog update) --- src/test/wpt/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/wpt/run.sh b/src/test/wpt/run.sh index 56bf1eec177..5d34e64308d 100755 --- a/src/test/wpt/run.sh +++ b/src/test/wpt/run.sh @@ -16,6 +16,8 @@ source _virtualenv/bin/activate if [[ $* == *--update-manifest* ]]; then (python -c "import html5lib" &>/dev/null) || pip install html5lib fi + +(python -c "import mozlog" &>/dev/null) || pip install mozlog==2.1 #Temporary fix for broken tree (python -c "import wptrunner" &>/dev/null) || pip install 'wptrunner==1.0' python $servo_root/src/test/wpt/run.py \ From 521e7038c02862d25c49eae551bc85cb495fa906 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 5 Aug 2014 11:56:03 +0200 Subject: [PATCH 2/2] Disable status-basic.htm. --- src/test/wpt/metadata/XMLHttpRequest/status-basic.htm.ini | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/test/wpt/metadata/XMLHttpRequest/status-basic.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/status-basic.htm.ini index 9f64a6a41fe..264f3238db8 100644 --- a/src/test/wpt/metadata/XMLHttpRequest/status-basic.htm.ini +++ b/src/test/wpt/metadata/XMLHttpRequest/status-basic.htm.ini @@ -1,8 +1,3 @@ [status-basic.htm] type: testharness - [XMLHttpRequest: status/statusText - various responses 7 (GET 402)] - expected: FAIL - - [XMLHttpRequest: status/statusText - various responses 9 (CHICKEN 402)] - expected: FAIL - + disabled: true