March 2012 - tor-commits - lists.torproject.org

[tor/master] Improve coverage in time-related unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 03258529d8216e7454227b166be159e70f993e90 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 13:19:03 2012 +0100 Improve coverage in time-related unit tests --- src/test/test_util.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 3860f15..1305e2f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -67,6 +67,15 @@ test_util_time(void) a_time.tm_mon = 1; /* Try a leap year, in feb. */ a_time.tm_mday = 10; test_eq((time_t) 1076393695UL, tor_timegm(&a_time)); + a_time.tm_mon = 0; + a_time.tm_mday = 10; + test_eq((time_t) 1073715295UL, tor_timegm(&a_time)); + a_time.tm_mon = 12; /* Wrong month, it's 0-based */ + a_time.tm_mday = 10; + test_eq((time_t) -1, tor_timegm(&a_time)); + a_time.tm_mon = -1; /* Wrong month */ + a_time.tm_mday = 10; + test_eq((time_t) -1, tor_timegm(&a_time)); /* Test {format,parse}_rfc1123_time */ @@ -78,9 +87,28 @@ test_util_time(void) t_res = 0; i = parse_rfc1123_time(timestr, &t_res); - test_eq(i,0); + test_eq(0,i); + test_eq(t_res, (time_t)1091580502UL); + /* The timezone doesn't matter */ + t_res = 0; + test_eq(0, parse_rfc1123_time("Wed, 04 Aug 2004 00:48:22 ZUL", &t_res)); test_eq(t_res, (time_t)1091580502UL); test_eq(-1, parse_rfc1123_time("Wed, zz Aug 2004 99-99x99 GMT", &t_res)); + test_eq(-1, parse_rfc1123_time("Wed, 32 Mar 2011 00:00:00 GMT", &t_res)); + test_eq(-1, parse_rfc1123_time("Wed, 30 Mar 2011 24:00:00 GMT", &t_res)); + test_eq(-1, parse_rfc1123_time("Wed, 30 Mar 2011 23:60:00 GMT", &t_res)); + test_eq(-1, parse_rfc1123_time("Wed, 30 Mar 2011 23:59:62 GMT", &t_res)); + test_eq(-1, parse_rfc1123_time("Wed, 30 Mar 1969 23:59:59 GMT", &t_res)); + test_eq(-1, parse_rfc1123_time("Wed, 30 Ene 2011 23:59:59 GMT", &t_res)); + test_eq(-1, parse_rfc1123_time("Wed, 30 Mar 2011 23:59:59 GM", &t_res)); + +#if 0 + /* This fails, I imagine it's important and should be fixed? */ + test_eq(-1, parse_rfc1123_time("Wed, 29 Feb 2011 16:00:00 GMT", &t_res)); + /* Why is this string valid (ie. the test fails because it doesn't + return -1)? */ + test_eq(-1, parse_rfc1123_time("Wed, 30 Mar 2011 23:59:61 GMT", &t_res)); +#endif /* Test tor_gettimeofday */

1 0

[tor/master] Remove unreliable assertion
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit a3679d30c050c96b43c17e8a8be4dc56490afe52 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 18 19:29:48 2012 +0100 Remove unreliable assertion * This assertion fails when executing the whole suite, but not when executing this test by itself * Ideally I'd prefer starting with a guaranteed empty directory, but it's not very important in this case as non-existence of other paths is being checked explicitly --- src/test/test_util.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 3efe617..3860f15 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1644,7 +1644,6 @@ test_util_listdir(void *ptr) dir_contents = tor_listdir(dirname); test_assert(dir_contents); /* make sure that each filename is listed. */ - test_eq(4, smartlist_len(dir_contents)); test_assert(smartlist_string_isin_case(dir_contents, "hopscotch")); test_assert(smartlist_string_isin_case(dir_contents, "mumblety-peg")); test_assert(smartlist_string_isin_case(dir_contents, ".hidden-file"));

1 0

[tor/master] Add some unit tests for parse_iso_time
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 8bb68011f082f12d50ddfbaee354448bfbb6e227 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 16:57:30 2012 +0100 Add some unit tests for parse_iso_time --- src/test/test_util.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index cc97484..714b3bd 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -111,6 +111,36 @@ test_util_time(void) #endif + /* Test parse_iso_time */ + + t_res = 0; + i = parse_iso_time("", &t_res); + test_eq(-1, i); + t_res = 0; + i = parse_iso_time("2004-08-32 00:48:22", &t_res); + test_eq(-1, i); + t_res = 0; + i = parse_iso_time("1969-08-03 00:48:22", &t_res); + test_eq(-1, i); + + t_res = 0; + i = parse_iso_time("2004-08-04 00:48:22", &t_res); + test_eq(0,i); + test_eq(t_res, (time_t)1091580502UL); + t_res = 0; + i = parse_iso_time("2004-8-4 0:48:22", &t_res); + test_eq(0, i); + test_eq(t_res, (time_t)1091580502UL); + test_eq(-1, parse_iso_time("2004-08-zz 99-99x99 GMT", &t_res)); + test_eq(-1, parse_iso_time("2011-03-32 00:00:00 GMT", &t_res)); + test_eq(-1, parse_iso_time("2011-03-30 24:00:00 GMT", &t_res)); + test_eq(-1, parse_iso_time("2011-03-30 23:60:00 GMT", &t_res)); + test_eq(-1, parse_iso_time("2011-03-30 23:59:62 GMT", &t_res)); + test_eq(-1, parse_iso_time("1969-03-30 23:59:59 GMT", &t_res)); + test_eq(-1, parse_iso_time("2011-00-30 23:59:59 GMT", &t_res)); + test_eq(-1, parse_iso_time("2011-03-30 23:59", &t_res)); + + /* Test tor_gettimeofday */ end.tv_sec = 4;

1 0

[tor/master] Add tests for string_is_C_identifier
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit c0974018793f6260b16e473de64cb5717f9764d0 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 13:24:22 2012 +0100 Add tests for string_is_C_identifier --- src/test/test_util.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 4fb565d..cc97484 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1633,6 +1633,35 @@ test_util_find_str_at_start_of_line(void *ptr) } static void +test_util_string_is_C_identifier(void *ptr) +{ + (void)ptr; + + test_eq(1, string_is_C_identifier("string_is_C_identifier")); + test_eq(1, string_is_C_identifier("_string_is_C_identifier")); + test_eq(1, string_is_C_identifier("_")); + test_eq(1, string_is_C_identifier("i")); + test_eq(1, string_is_C_identifier("_____")); + test_eq(1, string_is_C_identifier("__00__")); + test_eq(1, string_is_C_identifier("__init__")); + test_eq(1, string_is_C_identifier("_0")); + test_eq(1, string_is_C_identifier("_0string_is_C_identifier")); + test_eq(1, string_is_C_identifier("_0")); + + test_eq(0, string_is_C_identifier("0_string_is_C_identifier")); + test_eq(0, string_is_C_identifier("0")); + test_eq(0, string_is_C_identifier("")); + test_eq(0, string_is_C_identifier(";")); + test_eq(0, string_is_C_identifier("i;")); + test_eq(0, string_is_C_identifier("_;")); + test_eq(0, string_is_C_identifier("í")); + test_eq(0, string_is_C_identifier("ñ")); + + done: + ; +} + +static void test_util_asprintf(void *ptr) { #define LOREMIPSUM \ @@ -2679,6 +2708,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(strtok), UTIL_LEGACY(di_ops), UTIL_TEST(find_str_at_start_of_line, 0), + UTIL_TEST(string_is_C_identifier, 0), UTIL_TEST(asprintf, 0), UTIL_TEST(listdir, 0), UTIL_TEST(parent_dir, 0),

1 0

[tor/master] Improve coverage in string-related unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 1f6e3ec5006076d5ee7254489795bebbf8dab36a Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 13:20:32 2012 +0100 Improve coverage in string-related unit tests --- src/test/test_util.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1305e2f..4fb565d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -789,6 +789,27 @@ test_util_strmisc(void) test_streq(cp, "### Sm\n#### a\n#### l\n#### l\n#### t\n#### e\n#### s\n#### t\n"); tor_free(cp); SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_clear(sl); + + wrap_string(sl, "First null", 6, NULL, "> "); + cp = smartlist_join_strings(sl, "", 0, NULL); + test_streq(cp, "First\n> null\n"); + tor_free(cp); + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_clear(sl); + + wrap_string(sl, "Second null", 6, "> ", NULL); + cp = smartlist_join_strings(sl, "", 0, NULL); + test_streq(cp, "> Seco\nnd\nnull\n"); + tor_free(cp); + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_clear(sl); + + wrap_string(sl, "Both null", 6, NULL, NULL); + cp = smartlist_join_strings(sl, "", 0, NULL); + test_streq(cp, "Both\nnull\n"); + tor_free(cp); + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); smartlist_free(sl); /* Can't test prefixes that have the same length as the line width, because @@ -797,7 +818,7 @@ test_util_strmisc(void) /* Test hex_str */ { - char binary_data[64]; + char binary_data[68]; size_t i; for (i = 0; i < sizeof(binary_data); ++i) binary_data[i] = i; @@ -807,11 +828,36 @@ test_util_strmisc(void) test_streq(hex_str(binary_data, 32), "000102030405060708090A0B0C0D0E0F" "101112131415161718191A1B1C1D1E1F"); + test_streq(hex_str(binary_data, 34), + "000102030405060708090A0B0C0D0E0F" + "101112131415161718191A1B1C1D1E1F"); /* Repeat these tests for shorter strings after longer strings have been tried, to make sure we're correctly terminating strings */ test_streq(hex_str(binary_data, 1), "00"); test_streq(hex_str(binary_data, 0), ""); } + + /* Test strcmp_opt */ + test_eq(-1, strcmp_opt("", "foo")); + test_eq(0, strcmp_opt("", "")); + test_eq(1, strcmp_opt("foo", "")); + + test_eq(-1, strcmp_opt(NULL, "")); + test_eq(0, strcmp_opt(NULL, NULL)); + test_eq(1, strcmp_opt("", NULL)); + + test_eq(-1, strcmp_opt(NULL, "foo")); + test_eq(1, strcmp_opt("foo", NULL)); + + /* Test strcmp_len */ + test_eq(1, strcmp_len("foo", "bar", 3)); + test_eq(-1, strcmp_len("foo", "bar", 2)); /* First len, then lexical */ + test_eq(1, strcmp_len("foo2", "foo1", 4)); + test_eq(-1, strcmp_len("foo2", "foo1", 3)); /* Really stop at len */ + test_eq(0, strcmp_len("foo2", "foo", 3)); /* Really stop at len */ + test_eq(1, strcmp_len("blah", "", 4)); + test_eq(0, strcmp_len("blah", "", 0)); + done: ; } @@ -1565,6 +1611,7 @@ test_util_find_str_at_start_of_line(void *ptr) (void)ptr; test_eq_ptr(long_string, find_str_at_start_of_line(long_string, "")); + test_eq_ptr(NULL, find_str_at_start_of_line(short_string, "nonsense")); test_eq_ptr(NULL, find_str_at_start_of_line(long_string, "nonsense")); test_eq_ptr(NULL, find_str_at_start_of_line(long_string, "\n")); test_eq_ptr(NULL, find_str_at_start_of_line(long_string, "how "));

1 0

[tor/master] Add test for broken escapes in parse_config_...
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit fa4ca5ddc1f69911fa2dab08cf6d9ea6273daae3 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 17:39:43 2012 +0100 Add test for broken escapes in parse_config_... --- src/test/test_util.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 714b3bd..7625e2f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -415,6 +415,7 @@ test_util_config_line_escaped_content(void) char buf3[128]; char buf4[128]; char buf5[128]; + char buf6[128]; char *k=NULL, *v=NULL; const char *str; @@ -444,6 +445,9 @@ test_util_config_line_escaped_content(void) strlcpy(buf5, "BrokenHex \"\\xg4\"\n" , sizeof(buf5)); + strlcpy(buf6, "BrokenEscape \"\\" + , sizeof(buf6)); + str = buf1; str = parse_config_line_from_str(str, &k, &v); @@ -527,6 +531,12 @@ test_util_config_line_escaped_content(void) tor_free(k); tor_free(v); #endif + str = buf6; + + str = parse_config_line_from_str(str, &k, &v); + test_eq_ptr(str, NULL); + tor_free(k); tor_free(v); + done: tor_free(k); tor_free(v);

1 0

[tor/master] Add two small tests for tor_sscanf
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 6beec6a37338216f53e5e319c60005c1b970419a Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 17:00:16 2012 +0100 Add two small tests for tor_sscanf --- src/test/test_util.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7625e2f..6c14718 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1288,6 +1288,11 @@ test_util_sscanf(void) /* No '%'-strings: always "success" */ test_eq(0, tor_sscanf("hello world", "hello world")); test_eq(0, tor_sscanf("hello world", "good bye")); + /* Excess data */ + test_eq(0, tor_sscanf("hello 3", "%u", &u1)); /* have to match the start */ + test_eq(0, tor_sscanf(" 3 hello", "%u", &u1)); + test_eq(0, tor_sscanf(" 3 hello", "%2u", &u1)); /* not even in this case */ + test_eq(1, tor_sscanf("3 hello", "%u", &u1)); /* but trailing is alright */ /* Numbers (ie. %u) */ test_eq(0, tor_sscanf("hello world 3", "hello worlb %u", &u1)); /* d vs b */

1 0

[tor/master] Add some tests for expand_filename
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 043e154cddea9247c5e8432a7445a57ea5ab08c8 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 17:42:48 2012 +0100 Add some tests for expand_filename --- src/test/test_util.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6c14718..ecf4db2 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -542,6 +542,89 @@ test_util_config_line_escaped_content(void) tor_free(v); } +#ifndef MS_WINDOWS +static void +test_util_expand_filename(void) +{ + char *str; + + setenv("HOME", "/home/itv", 1); /* For "internal test value" */ + + str = expand_filename(""); + test_streq("", str); + tor_free(str); + + str = expand_filename("/normal/path"); + test_streq("/normal/path", str); + tor_free(str); + + str = expand_filename("/normal/trailing/path/"); + test_streq("/normal/trailing/path/", str); + tor_free(str); + + str = expand_filename("~"); + test_streq("/home/itv/", str); + tor_free(str); + + str = expand_filename("$HOME/nodice"); + test_streq("$HOME/nodice", str); + tor_free(str); + + str = expand_filename("~/"); + test_streq("/home/itv/", str); + tor_free(str); + + str = expand_filename("~/foobarqux"); + test_streq("/home/itv/foobarqux", str); + tor_free(str); + + str = expand_filename("~/../../etc/passwd"); + test_streq("/home/itv/../../etc/passwd", str); + tor_free(str); + + str = expand_filename("~/trailing/"); + test_streq("/home/itv/trailing/", str); + tor_free(str); + /* Ideally we'd test ~anotheruser, but that's shady to test (we'd + have to somehow inject/fake the get_user_homedir call) */ + + /* Try with empty $HOME */ + + setenv("HOME", "", 1); + + str = expand_filename("~"); + test_streq("/", str); + tor_free(str); + + str = expand_filename("~/"); + test_streq("/", str); + tor_free(str); + + str = expand_filename("~/foobar"); + test_streq("/foobar", str); + tor_free(str); + + /* Try with $HOME unset */ + + unsetenv("HOME"); + + str = expand_filename("~"); + test_streq("/", str); + tor_free(str); + + str = expand_filename("~/"); + test_streq("/", str); + tor_free(str); + + str = expand_filename("~/foobar"); + test_streq("/foobar", str); + tor_free(str); + + done: + tor_free(str); +} +#endif + /** Test basic string functionality. */ static void test_util_strmisc(void) @@ -2740,6 +2823,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(config_line_quotes), UTIL_LEGACY(config_line_comment_character), UTIL_LEGACY(config_line_escaped_content), + UTIL_LEGACY(expand_filename), UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2), UTIL_LEGACY(gzip),

1 0

[tor/master] expand_filename tests for trailing slash in $HOME
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 8e88377905edd10df10da1fc39dfe247c2270663 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 22:52:15 2012 +0100 expand_filename tests for trailing slash in $HOME --- src/test/test_util.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ecf4db2..c63f97d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -588,6 +588,21 @@ test_util_expand_filename(void) /* Ideally we'd test ~anotheruser, but that's shady to test (we'd have to somehow inject/fake the get_user_homedir call) */ + /* $HOME ending in a trailing slash */ + setenv("HOME", "/home/itv/", 1); + + str = expand_filename("~"); + test_streq("/home/itv/", str); + tor_free(str); + + str = expand_filename("~/"); + test_streq("/home/itv/", str); + tor_free(str); + + str = expand_filename("~/foo"); + test_streq("/home/itv/foo", str); + tor_free(str); + /* Try with empty $HOME */ setenv("HOME", "", 1);

1 0

[tor/master] Fix new strcmp_opt/len tests on OSs where strcmp() can return values >1 or <-1
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 97b15e6fb0a1cda39adfadfe9f9926b6cf35b136 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 21:00:57 2012 -0500 Fix new strcmp_opt/len tests on OSs where strcmp() can return values >1 or <-1 --- src/test/test_util.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 741b8d5..5bbf448 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -976,25 +976,25 @@ test_util_strmisc(void) } /* Test strcmp_opt */ - test_eq(-1, strcmp_opt("", "foo")); - test_eq(0, strcmp_opt("", "")); - test_eq(1, strcmp_opt("foo", "")); + tt_int_op(strcmp_opt("", "foo"), <, 0); + tt_int_op(strcmp_opt("", ""), ==, 0); + tt_int_op(strcmp_opt("foo", ""), >, 0); - test_eq(-1, strcmp_opt(NULL, "")); - test_eq(0, strcmp_opt(NULL, NULL)); - test_eq(1, strcmp_opt("", NULL)); + tt_int_op(strcmp_opt(NULL, ""), <, 0); + tt_int_op(strcmp_opt(NULL, NULL), ==, 0); + tt_int_op(strcmp_opt("", NULL), >, 0); - test_eq(-1, strcmp_opt(NULL, "foo")); - test_eq(1, strcmp_opt("foo", NULL)); + tt_int_op(strcmp_opt(NULL, "foo"), <, 0); + tt_int_op(strcmp_opt("foo", NULL), >, 0); /* Test strcmp_len */ - test_eq(1, strcmp_len("foo", "bar", 3)); - test_eq(-1, strcmp_len("foo", "bar", 2)); /* First len, then lexical */ - test_eq(1, strcmp_len("foo2", "foo1", 4)); - test_eq(-1, strcmp_len("foo2", "foo1", 3)); /* Really stop at len */ - test_eq(0, strcmp_len("foo2", "foo", 3)); /* Really stop at len */ - test_eq(1, strcmp_len("blah", "", 4)); - test_eq(0, strcmp_len("blah", "", 0)); + tt_int_op(strcmp_len("foo", "bar", 3), >, 0); + tt_int_op(strcmp_len("foo", "bar", 2), <, 0); /* First len, then lexical */ + tt_int_op(strcmp_len("foo2", "foo1", 4), >, 0); + tt_int_op(strcmp_len("foo2", "foo1", 3), <, 0); /* Really stop at len */ + tt_int_op(strcmp_len("foo2", "foo", 3), ==, 0); /* Really stop at len */ + tt_int_op(strcmp_len("blah", "", 4), >, 0); + tt_int_op(strcmp_len("blah", "", 0), ==, 0); done: ;

1 0