Add slow test for process_t for main loop interaction.

This patch adds test cases for process_t which uses Tor's main loop.
This allows us to test that the callbacks are actually invoked by the
main loop when we expect them.

See: https://bugs.torproject.org/28179
This commit is contained in:
Alexander Færøy 2018-11-26 02:18:04 +01:00 committed by Nick Mathewson
parent e3ceaebba2
commit 9b6a10a26f
6 changed files with 421 additions and 0 deletions

2
.gitignore vendored
View File

@ -240,6 +240,7 @@ uptime-*.json
/src/test/test-slow
/src/test/test-bt-cl
/src/test/test-child
/src/test/test-process
/src/test/test-memwipe
/src/test/test-ntor-cl
/src/test/test-hs-ntor-cl
@ -250,6 +251,7 @@ uptime-*.json
/src/test/test-slow.exe
/src/test/test-bt-cl.exe
/src/test/test-child.exe
/src/test/test-process.exe
/src/test/test-ntor-cl.exe
/src/test/test-hs-ntor-cl.exe
/src/test/test-memwipe.exe

View File

@ -66,6 +66,7 @@ noinst_PROGRAMS+= \
src/test/test-slow \
src/test/test-memwipe \
src/test/test-child \
src/test/test-process \
src/test/test_workqueue \
src/test/test-switch-id \
src/test/test-timers
@ -202,6 +203,7 @@ if UNITTESTS_ENABLED
src_test_test_slow_SOURCES += \
src/test/test_slow.c \
src/test/test_crypto_slow.c \
src/test/test_process_slow.c \
src/test/test_util_slow.c \
src/test/testing_common.c \
src/test/testing_rsakeys.c \

85
src/test/test-process.c Normal file
View File

@ -0,0 +1,85 @@
/* Copyright (c) 2011-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#include "orconfig.h"
#include <stdio.h>
#ifdef _WIN32
#define WINDOWS_LEAN_AND_MEAN
#include <windows.h>
#else
#include <unistd.h>
#endif /* defined(_WIN32) */
#include <string.h>
#include <stdlib.h>
#ifdef _WIN32
#define SLEEP(sec) Sleep((sec)*1000)
#else
#define SLEEP(sec) sleep(sec)
#endif
/* Trivial test program to test process_t. */
int
main(int argc, char **argv)
{
/* Does our process get the right arguments? */
for (int i = 0; i < argc; ++i) {
fprintf(stdout, "argv[%d] = '%s'\n", i, argv[i]);
fflush(stdout);
}
/* Make sure our process got our environment variable. */
fprintf(stdout, "Environment variable TOR_TEST_ENV = '%s'\n",
getenv("TOR_TEST_ENV"));
fflush(stdout);
/* Test line handling on stdout and stderr. */
fprintf(stdout, "Output on stdout\nThis is a new line\n");
fflush(stdout);
fprintf(stderr, "Output on stderr\nThis is a new line\n");
fflush(stderr);
fprintf(stdout, "Partial line on stdout ...");
fflush(stdout);
fprintf(stderr, "Partial line on stderr ...");
fflush(stderr);
SLEEP(2);
fprintf(stdout, "end of partial line on stdout\n");
fflush(stdout);
fprintf(stderr, "end of partial line on stderr\n");
fflush(stderr);
/* Echo input from stdin. */
char buffer[1024];
int count = 0;
while (fgets(buffer, sizeof(buffer), stdin)) {
/* Strip the newline. */
size_t size = strlen(buffer);
if (size >= 1 && buffer[size - 1] == '\n') {
buffer[size - 1] = '\0';
--size;
}
if (size >= 1 && buffer[size - 1] == '\r') {
buffer[size - 1] = '\0';
--size;
}
fprintf(stdout, "Read line from stdin: '%s'\n", buffer);
fflush(stdout);
if (++count == 3)
break;
}
fprintf(stdout, "We are done for here, thank you!\n");
return 0;
}

View File

@ -270,6 +270,7 @@ extern struct testcase_t voting_schedule_tests[];
extern struct testcase_t x509_tests[];
extern struct testcase_t slow_crypto_tests[];
extern struct testcase_t slow_process_tests[];
extern struct testcase_t slow_util_tests[];
extern struct testgroup_t testgroups[];

View File

@ -0,0 +1,330 @@
/* Copyright (c) 2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
/**
* \file test_process_slow.c
* \brief Slow test cases for the Process API.
*/
#include "orconfig.h"
#include "core/or/or.h"
#include "core/mainloop/mainloop.h"
#include "lib/evloop/compat_libevent.h"
#include "lib/process/process.h"
#include "lib/process/waitpid.h"
#include "test/test.h"
#ifndef BUILDDIR
#define BUILDDIR "."
#endif
#ifdef _WIN32
#define TEST_PROCESS "test-process.exe"
#else
#define TEST_PROCESS BUILDDIR "/src/test/test-process"
#endif /* defined(_WIN32) */
/** Timer that ticks once a second and stop the event loop after 5 ticks. */
static periodic_timer_t *main_loop_timeout_timer;
/** How many times have our timer ticked? */
static int timer_tick_count;
struct process_data_t {
smartlist_t *stdout_data;
smartlist_t *stderr_data;
smartlist_t *stdin_data;
process_exit_code_t exit_code;
};
typedef struct process_data_t process_data_t;
static process_data_t *
process_data_new(void)
{
process_data_t *process_data = tor_malloc_zero(sizeof(process_data_t));
process_data->stdout_data = smartlist_new();
process_data->stderr_data = smartlist_new();
process_data->stdin_data = smartlist_new();
return process_data;
}
static void
process_data_free(process_data_t *process_data)
{
if (process_data == NULL)
return;
SMARTLIST_FOREACH(process_data->stdout_data, char *, x, tor_free(x));
SMARTLIST_FOREACH(process_data->stderr_data, char *, x, tor_free(x));
SMARTLIST_FOREACH(process_data->stdin_data, char *, x, tor_free(x));
smartlist_free(process_data->stdout_data);
smartlist_free(process_data->stderr_data);
smartlist_free(process_data->stdin_data);
tor_free(process_data);
}
static void
process_stdout_callback(process_t *process, char *data, size_t size)
{
tt_ptr_op(process, OP_NE, NULL);
tt_ptr_op(data, OP_NE, NULL);
tt_int_op(strlen(data), OP_EQ, size);
process_data_t *process_data = process_get_data(process);
smartlist_add(process_data->stdout_data, tor_strdup(data));
done:
return;
}
static void
process_stderr_callback(process_t *process, char *data, size_t size)
{
tt_ptr_op(process, OP_NE, NULL);
tt_ptr_op(data, OP_NE, NULL);
tt_int_op(strlen(data), OP_EQ, size);
process_data_t *process_data = process_get_data(process);
smartlist_add(process_data->stderr_data, tor_strdup(data));
done:
return;
}
static void
process_exit_callback(process_t *process, process_exit_code_t exit_code)
{
tt_ptr_op(process, OP_NE, NULL);
process_data_t *process_data = process_get_data(process);
process_data->exit_code = exit_code;
/* Our process died. Let's check the values it returned. */
tor_shutdown_event_loop_and_exit(0);
done:
return;
}
#ifdef _WIN32
static const char *
get_win32_test_binary_path(void)
{
static char buffer[MAX_PATH];
/* Get the absolute path of our binary: \path\to\test-slow.exe. */
GetModuleFileNameA(GetModuleHandle(0), buffer, sizeof(buffer));
/* Find our process name. */
char *offset = strstr(buffer, "test-slow.exe");
tt_ptr_op(offset, OP_NE, NULL);
/* Change test-slow.exe to test-process.exe. */
memcpy(offset, TEST_PROCESS, strlen(TEST_PROCESS));
return buffer;
done:
return NULL;
}
#endif
static void
main_loop_timeout_cb(periodic_timer_t *timer, void *data)
{
/* Sanity check. */
tt_ptr_op(timer, OP_EQ, main_loop_timeout_timer);
tt_ptr_op(data, OP_EQ, NULL);
/* Have we been called 10 times we exit. */
timer_tick_count++;
tt_int_op(timer_tick_count, OP_LT, 10);
#ifndef _WIN32
/* Call waitpid callbacks. */
notify_pending_waitpid_callbacks();
#endif
return;
done:
/* Exit with an error. */
tor_shutdown_event_loop_and_exit(-1);
}
static void
run_main_loop(void)
{
int ret;
/* Wake up after 1 seconds. */
static const struct timeval interval = {1, 0};
timer_tick_count = 0;
main_loop_timeout_timer = periodic_timer_new(tor_libevent_get_base(),
&interval,
main_loop_timeout_cb,
NULL);
/* Run our main loop. */
ret = do_main_loop();
/* Clean up our main loop timeout timer. */
tt_int_op(ret, OP_EQ, 0);
done:
periodic_timer_free(main_loop_timeout_timer);
}
static void
test_callbacks(void *arg)
{
(void)arg;
const char *filename = NULL;
#ifdef _WIN32
filename = get_win32_test_binary_path();
#else
filename = TEST_PROCESS;
#endif
/* Initialize Process subsystem. */
process_init();
/* Process callback data. */
process_data_t *process_data = process_data_new();
/* Setup our process. */
process_t *process = process_new(filename);
process_set_data(process, process_data);
process_set_stdout_read_callback(process, process_stdout_callback);
process_set_stderr_read_callback(process, process_stderr_callback);
process_set_exit_callback(process, process_exit_callback);
/* Set environment variable. */
process_set_environment(process, "TOR_TEST_ENV", "Hello, from Tor!");
/* Add some arguments. */
process_append_argument(process, "This is the first one");
process_append_argument(process, "Second one");
process_append_argument(process, "Third: Foo bar baz");
/* Run our process. */
process_status_t status;
status = process_exec(process);
tt_int_op(status, OP_EQ, PROCESS_STATUS_RUNNING);
/* Write some lines to stdin. */
process_printf(process, "Hi process!\r\n");
process_printf(process, "Can you read more than one line?\n");
process_printf(process, "Can you read partial ...");
process_printf(process, " lines?\r\n");
/* Start our main loop. */
run_main_loop();
/* Check if our process is still running? */
status = process_get_status(process);
tt_int_op(status, OP_EQ, PROCESS_STATUS_NOT_RUNNING);
/* We returned. Let's see what our event loop said. */
tt_int_op(smartlist_len(process_data->stdout_data), OP_EQ, 12);
tt_int_op(smartlist_len(process_data->stderr_data), OP_EQ, 3);
tt_int_op(process_data->exit_code, OP_EQ, 0);
/* Check stdout output. */
char argv0_expected[256];
tor_snprintf(argv0_expected, sizeof(argv0_expected),
"argv[0] = '%s'", filename);
tt_str_op(smartlist_get(process_data->stdout_data, 0), OP_EQ,
argv0_expected);
tt_str_op(smartlist_get(process_data->stdout_data, 1), OP_EQ,
"argv[1] = 'This is the first one'");
tt_str_op(smartlist_get(process_data->stdout_data, 2), OP_EQ,
"argv[2] = 'Second one'");
tt_str_op(smartlist_get(process_data->stdout_data, 3), OP_EQ,
"argv[3] = 'Third: Foo bar baz'");
tt_str_op(smartlist_get(process_data->stdout_data, 4), OP_EQ,
"Environment variable TOR_TEST_ENV = 'Hello, from Tor!'");
tt_str_op(smartlist_get(process_data->stdout_data, 5), OP_EQ,
"Output on stdout");
tt_str_op(smartlist_get(process_data->stdout_data, 6), OP_EQ,
"This is a new line");
tt_str_op(smartlist_get(process_data->stdout_data, 7), OP_EQ,
"Partial line on stdout ...end of partial line on stdout");
tt_str_op(smartlist_get(process_data->stdout_data, 8), OP_EQ,
"Read line from stdin: 'Hi process!'");
tt_str_op(smartlist_get(process_data->stdout_data, 9), OP_EQ,
"Read line from stdin: 'Can you read more than one line?'");
tt_str_op(smartlist_get(process_data->stdout_data, 10), OP_EQ,
"Read line from stdin: 'Can you read partial ... lines?'");
tt_str_op(smartlist_get(process_data->stdout_data, 11), OP_EQ,
"We are done for here, thank you!");
/* Check stderr output. */
tt_str_op(smartlist_get(process_data->stderr_data, 0), OP_EQ,
"Output on stderr");
tt_str_op(smartlist_get(process_data->stderr_data, 1), OP_EQ,
"This is a new line");
tt_str_op(smartlist_get(process_data->stderr_data, 2), OP_EQ,
"Partial line on stderr ...end of partial line on stderr");
done:
process_data_free(process_data);
process_free(process);
process_free_all();
}
static void
test_callbacks_terminate(void *arg)
{
(void)arg;
const char *filename = NULL;
#ifdef _WIN32
filename = get_win32_test_binary_path();
#else
filename = TEST_PROCESS;
#endif
/* Initialize Process subsystem. */
process_init();
/* Process callback data. */
process_data_t *process_data = process_data_new();
/* Setup our process. */
process_t *process = process_new(filename);
process_set_data(process, process_data);
process_set_exit_callback(process, process_exit_callback);
/* Run our process. */
process_status_t status;
status = process_exec(process);
tt_int_op(status, OP_EQ, PROCESS_STATUS_RUNNING);
/* Zap our process. */
process_terminate(process);
/* Start our main loop. */
run_main_loop();
/* Check if our process is still running? */
status = process_get_status(process);
tt_int_op(status, OP_EQ, PROCESS_STATUS_NOT_RUNNING);
done:
process_data_free(process_data);
process_free(process);
process_free_all();
}
struct testcase_t slow_process_tests[] = {
{ "callbacks", test_callbacks, TT_FORK, NULL, NULL },
{ "callbacks_terminate", test_callbacks_terminate, TT_FORK, NULL, NULL },
END_OF_TESTCASES
};

View File

@ -20,6 +20,7 @@
struct testgroup_t testgroups[] = {
{ "slow/crypto/", slow_crypto_tests },
{ "slow/process/", slow_process_tests },
{ "slow/util/", slow_util_tests },
END_OF_GROUPS
};