Hans Leidekker : secur32/tests: Connect to test.winehq.org instead of www.winehq.org.
Alexandre Julliard
julliard at winehq.org
Mon Sep 3 16:26:09 CDT 2018
Module: wine
Branch: master
Commit: 061b0c459b1297321f519b5d2e1745320fc28187
URL: https://source.winehq.org/git/wine.git/?a=commit;h=061b0c459b1297321f519b5d2e1745320fc28187
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Sep 3 09:56:27 2018 +0200
secur32/tests: Connect to test.winehq.org instead of www.winehq.org.
Also make the tests more strict.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/secur32/tests/schannel.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index 1a37c52..2bd0e01 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -560,11 +560,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert)
cert_cnt++;
}
- ok(cert_cnt == 2 || cert_cnt == 3, "cert_cnt = %u\n", cert_cnt);
+ ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt);
ok(incl_remote, "context does not contain cert itself\n");
}
-static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n";
+static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: test.winehq.org\r\nConnection: close\r\n\r\n";
static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size)
{
@@ -690,7 +690,7 @@ static void test_communication(void)
SecBufferDesc buffers[2];
SecBuffer *buf;
- unsigned buf_size = 4000;
+ unsigned buf_size = 8192;
unsigned char *data;
unsigned data_size;
@@ -700,7 +700,7 @@ static void test_communication(void)
return;
}
- /* Create a socket and connect to www.winehq.org */
+ /* Create a socket and connect to test.winehq.org */
ret = WSAStartup(0x0202, &wsa_data);
if (ret)
{
@@ -708,10 +708,10 @@ static void test_communication(void)
return;
}
- host = gethostbyname("www.winehq.org");
+ host = gethostbyname("test.winehq.org");
if (!host)
{
- skip("Can't resolve www.winehq.org\n");
+ skip("Can't resolve test.winehq.org\n");
return;
}
@@ -728,7 +728,7 @@ static void test_communication(void)
ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr));
if (ret == SOCKET_ERROR)
{
- skip("Can't connect to www.winehq.org\n");
+ skip("Can't connect to test.winehq.org\n");
return;
}
@@ -806,7 +806,7 @@ todo_wine
ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n");
ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n");
- buffers[1].cBuffers = 4;
+ buffers[1].cBuffers = 1;
buffers[1].pBuffers[0].cbBuffer = 0;
status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
@@ -865,10 +865,9 @@ todo_wine
}
ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n");
- ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */,
- "InitializeSecurityContext failed: %08x\n", status);
+ ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status);
if(status != SEC_E_OK) {
- win_skip("Handshake failed\n");
+ skip("Handshake failed\n");
return;
}
More information about the wine-cvs
mailing list