feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Speed up waiting for file removal

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-07-03 14:21:27 +02:00
parent 3d68bcd6f7
commit 3d2db844c1
1 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
testsuite/testsuite.c
View File

@@ -264,6 +264,7 @@ int testsuite_test(int argc, char** argv)
#if !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT) && \ #if !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT) && \
defined(HAVE_CRL) && defined(HAVE_CRL_MONITOR) defined(HAVE_CRL) && defined(HAVE_CRL_MONITOR)
#define CRL_MONITOR_TEST_ROUNDS 6 #define CRL_MONITOR_TEST_ROUNDS 6
#define CRL_MONITOR_REM_FILE_ATTEMPTS 20
static int test_crl_monitor(void) static int test_crl_monitor(void)
{ {
@@ -291,7 +292,7 @@ static int test_crl_monitor(void)
"-H", "exitWithRet" "-H", "exitWithRet"
}; };
int ret = -1; int ret = -1;
int i; int i = -1, j;
printf("\nRunning CRL monitor test\n"); printf("\nRunning CRL monitor test\n");
@@ -321,44 +322,74 @@ static int test_crl_monitor(void)
if (i % 2 == 0) { if (i % 2 == 0) {
/* succeed on even rounds */ /* succeed on even rounds */
sprintf(buf, "%s/%s", tmpDir, "crl.pem"); sprintf(buf, "%s/%s", tmpDir, "crl.pem");
copy_file("certs/crl/crl.pem", buf); if (copy_file("certs/crl/crl.pem", buf) != 0) {
fprintf(stderr, "[%d] Failed to copy file to %s\n", i, buf);
goto cleanup;
}
sprintf(buf, "%s/%s", tmpDir, "crl.revoked"); sprintf(buf, "%s/%s", tmpDir, "crl.revoked");
/* The monitor can be holding the file handle and this will cause /* The monitor can be holding the file handle and this will cause
* the remove call to fail. Let's give the monitor a second to * the remove call to fail. Let's give the monitor a some time to
* finish up. */ * finish up. */
XSLEEP_MS(1000); for (j = 0; j < CRL_MONITOR_REM_FILE_ATTEMPTS; j++) {
rem_file(buf); /* i == 0 since there is nothing to delete in the first round */
if (i == 0 || rem_file(buf) == 0)
break;
XSLEEP_MS(100);
}
if (j == CRL_MONITOR_REM_FILE_ATTEMPTS) {
fprintf(stderr, "[%d] Failed to remove file %s\n", i, buf);
goto cleanup;
}
expectFail = 0; expectFail = 0;
} }
else { else {
/* fail on odd rounds */ /* fail on odd rounds */
sprintf(buf, "%s/%s", tmpDir, "crl.revoked"); sprintf(buf, "%s/%s", tmpDir, "crl.revoked");
copy_file("certs/crl/crl.revoked", buf); if (copy_file("certs/crl/crl.revoked", buf) != 0) {
fprintf(stderr, "[%d] Failed to copy file to %s\n", i, buf);
goto cleanup;
}
sprintf(buf, "%s/%s", tmpDir, "crl.pem"); sprintf(buf, "%s/%s", tmpDir, "crl.pem");
/* The monitor can be holding the file handle and this will cause /* The monitor can be holding the file handle and this will cause
* the remove call to fail. Let's give the monitor a second to * the remove call to fail. Let's give the monitor a some time to
* finish up. */ * finish up. */
XSLEEP_MS(1000); for (j = 0; j < CRL_MONITOR_REM_FILE_ATTEMPTS; j++) {
rem_file(buf); if (rem_file(buf) == 0)
break;
XSLEEP_MS(100);
}
if (j == CRL_MONITOR_REM_FILE_ATTEMPTS) {
fprintf(stderr, "[%d] Failed to remove file %s\n", i, buf);
goto cleanup;
}
expectFail = 1; expectFail = 1;
} }
/* Give server a moment to register the file change */
XSLEEP_MS(100);
client_args.return_code = 0; client_args.return_code = 0;
client_test(&client_args); client_test(&client_args);
if (!expectFail) { if (!expectFail) {
if (client_args.return_code != 0) if (client_args.return_code != 0) {
fprintf(stderr, "[%d] Incorrect return %d\n", i,
client_args.return_code);
goto cleanup; goto cleanup;
} }
}
else { else {
if (client_args.return_code == 0) if (client_args.return_code == 0) {
fprintf(stderr, "[%d] Expected failure\n", i);
goto cleanup; goto cleanup;
} }
} }
}
join_thread(serverThread); join_thread(serverThread);
ret = 0; ret = 0;
cleanup: cleanup:
if (ret != 0 && i >= 0)
fprintf(stderr, "test_crl_monitor failed on iteration %d\n", i);
sprintf(buf, "%s/%s", tmpDir, "crl.pem"); sprintf(buf, "%s/%s", tmpDir, "crl.pem");
rem_file(buf); rem_file(buf);
sprintf(buf, "%s/%s", tmpDir, "crl.revoked"); sprintf(buf, "%s/%s", tmpDir, "crl.revoked");