https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e2348037b080dc99619095df37c1b9894b6937b
commit 3e2348037b080dc99619095df37c1b9894b6937b Author: winesync <[email protected]> AuthorDate: Tue Dec 8 17:46:15 2020 +0100 Commit: Jérôme Gardou <[email protected]> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] wininet/tests: Skip some FTP tests when no connection can be made. Signed-off-by: Sven Baars <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 237d5636271a1a78b02a0eb7feaab7dfb9dfed57 by Sven Baars <[email protected]> --- modules/rostests/winetests/wininet/ftp.c | 16 +++++++--------- sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/rostests/winetests/wininet/ftp.c b/modules/rostests/winetests/wininet/ftp.c index 6a3e4dc1d98..539d725173a 100644 --- a/modules/rostests/winetests/wininet/ftp.c +++ b/modules/rostests/winetests/wininet/ftp.c @@ -63,7 +63,7 @@ static void test_connect(HINTERNET hInternet) HINTERNET hFtp; /* Try a few username/password combinations: - * anonymous : NULL + * anonymous : IEUser@ * NULL : IEUser@ * NULL : NULL * "" : IEUser@ @@ -72,16 +72,14 @@ static void test_connect(HINTERNET hInternet) SetLastError(0xdeadbeef); hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); - if (hFtp) /* some servers accept an empty password */ + if (!hFtp) { - ros_skip_flaky - ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); - InternetCloseHandle(hFtp); + skip("No ftp connection could be made to ftp.winehq.org %u\n", GetLastError()); + return; } - else - ros_skip_flaky - ok ( GetLastError() == ERROR_INTERNET_LOGIN_FAILURE, - "Expected ERROR_INTERNET_LOGIN_FAILURE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); SetLastError(0xdeadbeef); hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, NULL, "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 56da4b2c261..297357fee1a 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 8b2d3857136c50d56c706a7f880fc605b325e334 + wine: 237d5636271a1a78b02a0eb7feaab7dfb9dfed57
