Commit 061b0c45 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

secur32/tests: Connect to test.winehq.org instead of www.winehq.org.

Also make the tests more strict. Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c8175e6c
...@@ -560,11 +560,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) ...@@ -560,11 +560,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert)
cert_cnt++; 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"); 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) static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size)
{ {
...@@ -690,7 +690,7 @@ static void test_communication(void) ...@@ -690,7 +690,7 @@ static void test_communication(void)
SecBufferDesc buffers[2]; SecBufferDesc buffers[2];
SecBuffer *buf; SecBuffer *buf;
unsigned buf_size = 4000; unsigned buf_size = 8192;
unsigned char *data; unsigned char *data;
unsigned data_size; unsigned data_size;
...@@ -700,7 +700,7 @@ static void test_communication(void) ...@@ -700,7 +700,7 @@ static void test_communication(void)
return; return;
} }
/* Create a socket and connect to www.winehq.org */ /* Create a socket and connect to test.winehq.org */
ret = WSAStartup(0x0202, &wsa_data); ret = WSAStartup(0x0202, &wsa_data);
if (ret) if (ret)
{ {
...@@ -708,10 +708,10 @@ static void test_communication(void) ...@@ -708,10 +708,10 @@ static void test_communication(void)
return; return;
} }
host = gethostbyname("www.winehq.org"); host = gethostbyname("test.winehq.org");
if (!host) if (!host)
{ {
skip("Can't resolve www.winehq.org\n"); skip("Can't resolve test.winehq.org\n");
return; return;
} }
...@@ -728,7 +728,7 @@ static void test_communication(void) ...@@ -728,7 +728,7 @@ static void test_communication(void)
ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr)); ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr));
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
skip("Can't connect to www.winehq.org\n"); skip("Can't connect to test.winehq.org\n");
return; return;
} }
...@@ -806,7 +806,7 @@ todo_wine ...@@ -806,7 +806,7 @@ todo_wine
ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); 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"); 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; buffers[1].pBuffers[0].cbBuffer = 0;
status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
...@@ -865,10 +865,9 @@ todo_wine ...@@ -865,10 +865,9 @@ todo_wine
} }
ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); 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 */, ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status);
"InitializeSecurityContext failed: %08x\n", status);
if(status != SEC_E_OK) { if(status != SEC_E_OK) {
win_skip("Handshake failed\n"); skip("Handshake failed\n");
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment