Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-28 05:28:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KMTESTS:TCPIP] Fix ok() messages.

Browse source
This commit is contained in:
Thomas Faber 2018-01-31 10:23:44 +01:00
parent 7f687154a0
commit 478bfb484a
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modules/rostests/kmtests/tcpip/TcpIp_user.c
View file

@ -30,9 +30,12 @@ UnloadTcpIpTestDriver(void)
START_TEST(TcpIpTdi) START_TEST(TcpIpTdi)
{ {
DWORD Error;
LoadTcpIpTestDriver(); LoadTcpIpTestDriver();
ok(KmtSendToDriver(IOCTL_TEST_TDI) == ERROR_SUCCESS, "\n"); Error = KmtSendToDriver(IOCTL_TEST_TDI);
ok_eq_ulong(Error, ERROR_SUCCESS);
UnloadTcpIpTestDriver(); UnloadTcpIpTestDriver();
} }
@ -54,10 +57,10 @@ AcceptProc(
/* Initialize winsock */ /* Initialize winsock */
WinsockVersion = MAKEWORD(2, 0); WinsockVersion = MAKEWORD(2, 0);
Error = WSAStartup(WinsockVersion, &WsaData); Error = WSAStartup(WinsockVersion, &WsaData);
ok(Error == 0, ""); ok_eq_int(Error, 0);
ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
ok(ListenSocket != INVALID_SOCKET, "socket failed"); ok(ListenSocket != INVALID_SOCKET, "socket failed\n");
ZeroMemory(&ListenAddress, sizeof(ListenAddress)); ZeroMemory(&ListenAddress, sizeof(ListenAddress));
ListenAddress.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); ListenAddress.sin_addr.S_un.S_addr = inet_addr("127.0.0.1");
@ -65,16 +68,16 @@ AcceptProc(
ListenAddress.sin_family = AF_INET; ListenAddress.sin_family = AF_INET;
Error = bind(ListenSocket, (struct sockaddr*)&ListenAddress, sizeof(ListenAddress)); Error = bind(ListenSocket, (struct sockaddr*)&ListenAddress, sizeof(ListenAddress));
ok(Error == 0, ""); ok_eq_int(Error, 0);
Error = listen(ListenSocket, 1); Error = listen(ListenSocket, 1);
ok(Error == 0, ""); ok_eq_int(Error, 0);
SetEvent(ReadyToConnectEvent); SetEvent(ReadyToConnectEvent);
AcceptAddressLength = sizeof(AcceptAddress); AcceptAddressLength = sizeof(AcceptAddress);
AcceptSocket = accept(ListenSocket, (struct sockaddr*)&AcceptAddress, &AcceptAddressLength); AcceptSocket = accept(ListenSocket, (struct sockaddr*)&AcceptAddress, &AcceptAddressLength);
ok(AcceptSocket != INVALID_SOCKET, "\n"); ok(AcceptSocket != INVALID_SOCKET, "accept failed\n");
ok_eq_long(AcceptAddressLength, sizeof(AcceptAddress)); ok_eq_long(AcceptAddressLength, sizeof(AcceptAddress));
ok_eq_hex(AcceptAddress.sin_addr.S_un.S_addr, inet_addr("127.0.0.1")); ok_eq_hex(AcceptAddress.sin_addr.S_un.S_addr, inet_addr("127.0.0.1"));
ok_eq_hex(AcceptAddress.sin_port, htons(TEST_CONNECT_CLIENT_PORT)); ok_eq_hex(AcceptAddress.sin_port, htons(TEST_CONNECT_CLIENT_PORT));
@ -86,18 +89,20 @@ START_TEST(TcpIpConnect)
{ {
HANDLE AcceptThread; HANDLE AcceptThread;
HANDLE ReadyToConnectEvent; HANDLE ReadyToConnectEvent;
DWORD Error;
ReadyToConnectEvent = CreateEvent(NULL, TRUE, FALSE, NULL); ReadyToConnectEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
ok(ReadyToConnectEvent != NULL, "\n"); ok(ReadyToConnectEvent != NULL, "CreateEvent failed\n");
AcceptThread = CreateThread(NULL, 0, AcceptProc, (PVOID)ReadyToConnectEvent, 0, NULL); AcceptThread = CreateThread(NULL, 0, AcceptProc, (PVOID)ReadyToConnectEvent, 0, NULL);
ok(AcceptThread != NULL, ""); ok(AcceptThread != NULL, "CreateThread failed\n");
WaitForSingleObject(ReadyToConnectEvent, INFINITE); WaitForSingleObject(ReadyToConnectEvent, INFINITE);
LoadTcpIpTestDriver(); LoadTcpIpTestDriver();
ok(KmtSendToDriver(IOCTL_TEST_CONNECT) == ERROR_SUCCESS, "\n"); Error = KmtSendToDriver(IOCTL_TEST_CONNECT);
ok_eq_ulong(Error, ERROR_SUCCESS);
WaitForSingleObject(AcceptThread, INFINITE); WaitForSingleObject(AcceptThread, INFINITE);

4
modules/rostests/kmtests/tcpip/connect.c
View file

@ -68,7 +68,7 @@ TestTcpConnect(void)
FileInfo = ExAllocatePoolWithTag(NonPagedPool, FileInfo = ExAllocatePoolWithTag(NonPagedPool,
FileInfoSize, FileInfoSize,
TAG_TEST); TAG_TEST);
ok(FileInfo != NULL, ""); ok(FileInfo != NULL, "FileInfo is NULL!\n");
RtlZeroMemory(FileInfo, FileInfoSize); RtlZeroMemory(FileInfo, FileInfoSize);
FileInfo->EaNameLength = TDI_TRANSPORT_ADDRESS_LENGTH; FileInfo->EaNameLength = TDI_TRANSPORT_ADDRESS_LENGTH;
@ -111,7 +111,7 @@ TestTcpConnect(void)
FileInfo = ExAllocatePoolWithTag(NonPagedPool, FileInfo = ExAllocatePoolWithTag(NonPagedPool,
FileInfoSize, FileInfoSize,
TAG_TEST); TAG_TEST);
ok(FileInfo != NULL, ""); ok(FileInfo != NULL, "FileInfo is NULL!\n");
RtlZeroMemory(FileInfo, FileInfoSize); RtlZeroMemory(FileInfo, FileInfoSize);
FileInfo->EaNameLength = TDI_CONNECTION_CONTEXT_LENGTH; FileInfo->EaNameLength = TDI_CONNECTION_CONTEXT_LENGTH;