mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 21:16:22 +02:00
Fix some whitespace; tighten the tests.
This commit is contained in:
parent
0f070e7858
commit
7ef9ecf6b3
@ -1,2 +1,4 @@
|
|||||||
o Minor bugfixes:
|
o Minor bugfixes:
|
||||||
- Added additional argument to write_chunks_to_file to optionally skip using a temp file to do non-atomic writes. Implements ticket #1376.
|
|
||||||
|
- Added additional argument to write_chunks_to_file to optionally skip
|
||||||
|
using a temp file to do non-atomic writes. Implements ticket #1376.
|
||||||
|
@ -2196,12 +2196,12 @@ write_chunks_to_file_impl(const char *fname, const smartlist_t *chunks,
|
|||||||
* atomically. */
|
* atomically. */
|
||||||
int
|
int
|
||||||
write_chunks_to_file(const char *fname, const smartlist_t *chunks, int bin,
|
write_chunks_to_file(const char *fname, const smartlist_t *chunks, int bin,
|
||||||
int no_tempfile)
|
int no_tempfile)
|
||||||
{
|
{
|
||||||
int flags = OPEN_FLAGS_REPLACE|(bin?O_BINARY:O_TEXT);
|
int flags = OPEN_FLAGS_REPLACE|(bin?O_BINARY:O_TEXT);
|
||||||
|
|
||||||
if (no_tempfile) {
|
if (no_tempfile) {
|
||||||
// O_APPEND stops write_chunks_to_file from using tempfiles
|
/* O_APPEND stops write_chunks_to_file from using tempfiles */
|
||||||
flags |= O_APPEND;
|
flags |= O_APPEND;
|
||||||
}
|
}
|
||||||
return write_chunks_to_file_impl(fname, chunks, flags);
|
return write_chunks_to_file_impl(fname, chunks, flags);
|
||||||
|
@ -103,43 +103,42 @@ test_util_read_file_eof_zero_bytes(void *arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Test the basic expected behaviour for write_chunks_to_file.
|
/* Test the basic expected behaviour for write_chunks_to_file.
|
||||||
* NOTE: This will need to be updated if we ever change the tempfile location
|
* NOTE: This will need to be updated if we ever change the tempfile location
|
||||||
* or extension */
|
* or extension */
|
||||||
static void
|
static void
|
||||||
test_util_write_chunks_to_file(void *arg)
|
test_util_write_chunks_to_file(void *arg)
|
||||||
{
|
{
|
||||||
char *fname;
|
char *fname = NULL;
|
||||||
char *tempname;
|
char *tempname = NULL;
|
||||||
char *str;
|
char *str = NULL;
|
||||||
char *data_str;
|
|
||||||
char *temp_str;
|
|
||||||
int r;
|
int r;
|
||||||
int fd = -1;
|
int fd = -1;
|
||||||
size_t sz = 999999;
|
struct stat st;
|
||||||
(void)arg;
|
|
||||||
|
|
||||||
/* These should be two different sizes to ensure the data is different
|
/* These should be two different sizes to ensure the data is different
|
||||||
* between the data file and the temp file's 'known string' */
|
* between the data file and the temp file's 'known string' */
|
||||||
int temp_str_len = 1024;
|
int temp_str_len = 1024;
|
||||||
int data_str_len = 512;
|
int data_str_len = 512;
|
||||||
temp_str = tor_malloc(temp_str_len);
|
char *data_str = tor_malloc(data_str_len);
|
||||||
data_str = tor_malloc(data_str_len);
|
char *temp_str = tor_malloc(temp_str_len);
|
||||||
crypto_rand(temp_str, temp_str_len);
|
|
||||||
crypto_rand(data_str, data_str_len);
|
|
||||||
tt_assert(temp_str != NULL);
|
|
||||||
tt_assert(data_str != NULL);
|
|
||||||
|
|
||||||
// Ensure it can write multiple chunks
|
|
||||||
smartlist_t *chunks = smartlist_new();
|
smartlist_t *chunks = smartlist_new();
|
||||||
sized_chunk_t c = {data_str, data_str_len/2};
|
sized_chunk_t c = {data_str, data_str_len/2};
|
||||||
sized_chunk_t c2 = {data_str + data_str_len/2, data_str_len/2};
|
sized_chunk_t c2 = {data_str + data_str_len/2, data_str_len/2};
|
||||||
|
(void)arg;
|
||||||
|
|
||||||
|
crypto_rand(temp_str, temp_str_len);
|
||||||
|
crypto_rand(data_str, data_str_len);
|
||||||
|
|
||||||
|
// Ensure it can write multiple chunks
|
||||||
|
|
||||||
smartlist_add(chunks, &c);
|
smartlist_add(chunks, &c);
|
||||||
smartlist_add(chunks, &c2);
|
smartlist_add(chunks, &c2);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if it writes using a tempfile
|
* Check if it writes using a tempfile
|
||||||
*/
|
*/
|
||||||
fname = tor_strdup("tor_test_write_chunks_to_file_with_tempfile");
|
fname = tor_strdup(get_fname("write_chunks_with_tempfile"));
|
||||||
tor_asprintf(&tempname, "%s.tmp", fname);
|
tor_asprintf(&tempname, "%s.tmp", fname);
|
||||||
|
|
||||||
// write a known string to a file where the tempfile will be
|
// write a known string to a file where the tempfile will be
|
||||||
@ -151,19 +150,15 @@ test_util_write_chunks_to_file(void *arg)
|
|||||||
tt_int_op(r, ==, 0);
|
tt_int_op(r, ==, 0);
|
||||||
|
|
||||||
// assert the file has been written (expected size)
|
// assert the file has been written (expected size)
|
||||||
fd = open(fname, O_RDONLY|O_BINARY);
|
str = read_file_to_str(fname, RFTS_BIN, &st);
|
||||||
tt_int_op(fd, >=, 0);
|
|
||||||
str = read_file_to_str_until_eof(fd, data_str_len*2, &sz);
|
|
||||||
tt_assert(str != NULL);
|
tt_assert(str != NULL);
|
||||||
tt_int_op(sz, ==, data_str_len);
|
tt_int_op(st.st_size, ==, data_str_len);
|
||||||
test_mem_op(data_str, ==, str, sz);
|
test_mem_op(data_str, ==, str, data_str_len);
|
||||||
tor_free(str);
|
tor_free(str);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
// assert that the tempfile is removed (should not leave artifacts)
|
// assert that the tempfile is removed (should not leave artifacts)
|
||||||
fd = open(tempname, O_RDONLY|O_BINARY);
|
str = read_file_to_str(tempname, RFTS_BIN|RFTS_IGNORE_MISSING, &st);
|
||||||
tt_int_op(fd, <, 0); // This might be untrue
|
|
||||||
str = read_file_to_str_until_eof(fd, temp_str_len*2, &sz);
|
|
||||||
tt_assert(str == NULL);
|
tt_assert(str == NULL);
|
||||||
|
|
||||||
// Remove old testfile for second test
|
// Remove old testfile for second test
|
||||||
@ -175,7 +170,7 @@ test_util_write_chunks_to_file(void *arg)
|
|||||||
/*
|
/*
|
||||||
* Check if it skips using a tempfile with flags
|
* Check if it skips using a tempfile with flags
|
||||||
*/
|
*/
|
||||||
fname = tor_strdup("tor_test_write_chunks_to_file_with_no_tempfile");
|
fname = tor_strdup(get_fname("write_chunks_with_no_tempfile"));
|
||||||
tor_asprintf(&tempname, "%s.tmp", fname);
|
tor_asprintf(&tempname, "%s.tmp", fname);
|
||||||
|
|
||||||
// write a known string to a file where the tempfile will be
|
// write a known string to a file where the tempfile will be
|
||||||
@ -187,34 +182,30 @@ test_util_write_chunks_to_file(void *arg)
|
|||||||
tt_int_op(r, ==, 0);
|
tt_int_op(r, ==, 0);
|
||||||
|
|
||||||
// assert the file has been written (expected size)
|
// assert the file has been written (expected size)
|
||||||
fd = open(fname, O_RDONLY|O_BINARY);
|
str = read_file_to_str(fname, RFTS_BIN, &st);
|
||||||
tt_int_op(fd, >=, 0);
|
|
||||||
str = read_file_to_str_until_eof(fd, data_str_len*2, &sz);
|
|
||||||
tt_assert(str != NULL);
|
tt_assert(str != NULL);
|
||||||
tt_int_op(sz, ==, data_str_len);
|
tt_int_op(st.st_size, ==, data_str_len);
|
||||||
test_mem_op(data_str, ==, str, sz);
|
test_mem_op(data_str, ==, str, data_str_len);
|
||||||
tor_free(str);
|
tor_free(str);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
// assert the tempfile still contains the known string
|
// assert the tempfile still contains the known string
|
||||||
fd = open(tempname, O_RDONLY|O_BINARY);
|
str = read_file_to_str(tempname, RFTS_BIN, &st);
|
||||||
tt_int_op(fd, >=, 0); // This might be untrue
|
|
||||||
str = read_file_to_str_until_eof(fd, temp_str_len*2, &sz);
|
|
||||||
tt_assert(str != NULL);
|
tt_assert(str != NULL);
|
||||||
tt_int_op(sz, ==, temp_str_len);
|
tt_int_op(st.st_size, ==, temp_str_len);
|
||||||
test_mem_op(temp_str, ==, str, sz);
|
test_mem_op(temp_str, ==, str, temp_str_len);
|
||||||
|
|
||||||
done:
|
done:
|
||||||
unlink(fname);
|
unlink(fname);
|
||||||
unlink(tempname);
|
unlink(tempname);
|
||||||
smartlist_free(chunks);
|
smartlist_free(chunks);
|
||||||
tor_free(fname);
|
tor_free(fname);
|
||||||
tor_free(tempname);
|
tor_free(tempname);
|
||||||
tor_free(str);
|
tor_free(str);
|
||||||
tor_free(data_str);
|
tor_free(data_str);
|
||||||
tor_free(temp_str);
|
tor_free(temp_str);
|
||||||
if (fd >= 0)
|
if (fd >= 0)
|
||||||
close(fd);
|
close(fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
Reference in New Issue
Block a user