[PATCH] mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled

Mon Jan 8 07:47:54 CST 2018

Hi Nikolay,

On 06.01.2018 15:48, Nikolay Sivov wrote:
> Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
> ---
>  dlls/mshtml/tests/dom.c       | 7 ++++++-
>  dlls/mshtml/tests/jstest.html | 9 ++++++++-
>  2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
> index b00346759f..845983ccd6 100644
> --- a/dlls/mshtml/tests/dom.c
> +++ b/dlls/mshtml/tests/dom.c
> @@ -6683,7 +6683,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window)
>  
>      hres = IHTMLWindow5_get_XMLHttpRequest(window, &var);
>      ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres);
> -    ok(V_VT(&var) == VT_DISPATCH, "expect VT_DISPATCH, got %s\n", debugstr_variant(&var));
> +    ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var));
> +
> +    if (V_VT(&var) == VT_EMPTY) {
> +        skip("Native XMLHTTP support is missing or disabled.\n");

I think this should be win_skip (you mark that as broken() anyway).

> +        return;
> +    }
>  
>      factory = NULL;
>      hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory);
> diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html
> index cce805032c..8d399d0747 100644
> --- a/dlls/mshtml/tests/jstest.html
> +++ b/dlls/mshtml/tests/jstest.html
> @@ -1,5 +1,8 @@
>  <html>
>  <head>
> +<script src="winetest.js" type="text/javascript"></script>
> +</head>
> +<head>

This is the right thing to do, but please remove ok() from jstest.html
to avoid conflicts.

>  <script>
>  function ok(b,m) {
>      return external.ok(b, m);
> @@ -355,8 +358,12 @@ function test_text_node() {
>  }
>  
>  function test_xhr() {
> +    if (typeof(XMLHttpRequest) != "object") {
> +        win_skip("XMLHTTPRequest is not available or disabled");
> +        return;
> +    }
> +
>      ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n");

As far as I understand ok("XMLHttpRequest" in window) test works fine in
this configuration. It would be nice to keep the test before skipping
the rest.

Thanks,
Jacek
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20180108/2bd00ade/attachment.html>