tor-commits October 2015

tor-commits@lists.torproject.org

14 participants
1182 discussions

[metrics-lib/master] Add a first draft of a contributor's guide.
by karsten＠torproject.org 22 Oct '15

22 Oct '15

commit d907267cba285dd3f61299eec7c04541e10ee11d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Oct 17 11:59:24 2015 +0200 Add a first draft of a contributor's guide. --- CONTRIB.md | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/CONTRIB.md b/CONTRIB.md new file mode 100644 index 0000000..89c1f45 --- /dev/null +++ b/CONTRIB.md @@ -0,0 +1,91 @@ +A contributor's guide to how we develop metrics-lib +=================================================== + +Dear contributor to metrics-lib, this text is an attempt to tell you how we do development for this fine library. We highly encourage you to read it when making contributions to metrics-lib to make it easier for us to accept them. But we also invite you to question these guidelines and make suggestions if you see room for improvement. + + +Purpose +------- + +Before we go into the details of writing code, let's briefly talk about the purpose of metrics-lib. Back in 2011, the reason for creating this library was to avoid rewriting the same code over and over that would handle data gathered in the Tor network. metrics-lib is now being used in the major Java-based tools in the Tor metrics space, and it's being used by researchers to do one-off analyses of Tor network data. + + +Design overview +--------------- + +metrics-lib is not that big, so it shouldn't be difficult to go through the interfaces and classes to see what they are doing. But to give you a general overview, here are some highlights: + + - We tried to separate interfaces from implementation classes as much as possible and put them into different packages. As a rule of thumb, applications using metrics-lib should never need to import one of the implementation classes. + + - There are two types of classes: descriptor classes and classes that provide descriptor instances. For the first type there's a class for each method to obtain descriptors, and for the second type there's a class for pretty much each kind of descriptor that is available in the Tor network. + + +Dependencies +------------ + +We tried to keep the number of dependencies as small as possible, and we tried to avoid adding any dependencies that wouldn't be available in common operating system distributions like Debian stable. That doesn't mean that we're opposed to add any further dependencies, but we need to keep in mind that any user of our library will have to add those dependencies, too. + + +Code style +---------- + +We're using a code style that is not really formally defined but that roughly follows these rules: + + - We avoid tabs and favor 2 spaces where other people would use a tab. + - We break lines after at most 74 characters and indent new lines with 4 spaces. + - Every public interface or method should have a comment, which should be a full sentence. We failed to turn these comments into JavaDoc comments, but we should fix that at some point. + +There's probably more to say about code style, but please take a look at the existing code and try to write new code as similar as possible. + + +Tests +----- + +metrics-lib is still rather light on unit tests, but that shouldn't prevent us from writing tests for new code. Test classes go into a separate source directory and use the same package structure as the class they're supposed to test. + + +Deprecating features +-------------------- + +We have to assume that applications don't update their metrics-lib version very often. This is related to the lack of a release process so far. If we want to remove a feature we'll have to deprecate it and basically keep it working for at least another year. + + +Change log +---------- + +We didn't have a change log for a long time, but we should totally have one if we want to put out releases. Here we're going to describe what deserves a change log entry and whether those changes are major or minor: + + - Bug fixes obviously need a change log entry, but it depends on the bug whether it should be listed as major or minor change. + + - Enhancements that extend the API are also worth noting in the change log, though their importance would most likely be minor. + + - All enhancements must be backwards-compatible, so whenever we want to switch to a different interface we'll have to deprecate the existing interface and at the same time provide a new one that applications should use instead. Deprecating a feature would be a minor change that should be mentioned in the change log. + + - Enhancements that make the implementation more efficient or that refactor some internal code might also be worth noting in the change log, but very likely as minor enhancements. An exception would be ground-breaking performance improvements that most application developers would care about, which would be major enhancements. + + - Whenever we add a new dependency, that's clearly a major change that needs to be written into the change log, because applications will have to add this dependency, too. + + - Removing an existing dependency is also worth mentioning in the change log, though that's rather a minor change that doesn't force applications to act that quickly. + + - Any simple code cleanups, new tests, changes to documentation like this file, etc. obviously don't require putting in a change log entry. + + +Releases +-------- + +As mentioned before we didn't put out releases for far too long. But we're about to change that. As a rule of thumb, we should put out a new release of metrics-lib soon after making a major change as listed under "Change log" above. If we're planning to make more changes soon after, let's wait for them and make a release with everything. But we shouldn't let a major change sit in an unreleased metrics-lib for more than, say, two weeks. In contrast to that, minor changes can stay unreleased for longer, though they don't have to if we want to use them in an application sooner. + +Regarding version numbers, we'll start with 1.0 and bump to 1.1, 1.2, etc. for each backwards-compatible change. When we remove a previously deprecated feature, making a backwards-incompatible change, we'll bump to 2.0. + + +Packages +-------- + +There are no metrics-lib packages yet, but we should aim for providing packages for at least Debian stable, either official or unofficial. + + +Closing words +------------- + +Dear contributor, now that you made it to the end of this guide, please be reminded that these are just guidelines that shall make it easier for us to work on metrics-lib. But we're making these rules ourselves, and that "we" includes you. Please suggest any changes to this guide and help us make it better. Thanks! +

1 0

[metrics-lib/master] Add more details about dependencies.
by karsten＠torproject.org 22 Oct '15

22 Oct '15

commit b7693eccb55203b0432a61084e7c4878fd2db1d2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 22 11:28:40 2015 +0200 Add more details about dependencies. Suggested by atagar on #17370. --- CONTRIB.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIB.md b/CONTRIB.md index 89c1f45..b306dd5 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -25,6 +25,14 @@ Dependencies We tried to keep the number of dependencies as small as possible, and we tried to avoid adding any dependencies that wouldn't be available in common operating system distributions like Debian stable. That doesn't mean that we're opposed to add any further dependencies, but we need to keep in mind that any user of our library will have to add those dependencies, too. +metrics-lib currently has the following dependencies to compile: + + - Apache Commons Compression + https://commons.apache.org/proper/commons-compress/download_compress.cgi + + - JUnit + https://github.com/junit-team/junit/wiki/Download-and-Install + Code style ----------

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 22 Oct '15

22 Oct '15

commit 3abe7eba1b5225dbbf2f11a6a55cdb91ddb021fd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 22 09:15:24 2015 +0000 Update translations for tails-greeter --- uz/uz.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/uz/uz.po b/uz/uz.po index 99518a0..42f4648 100644 --- a/uz/uz.po +++ b/uz/uz.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Kozimbek <knazarbekov(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Uzbek (http://www.transifex.com/projects/p/torproject/language/uz/)\n" +"POT-Creation-Date: 2015-09-20 18:20+0200\n" +"PO-Revision-Date: 2015-10-22 08:54+0000\n" +"Last-Translator: Kozimbek <knazarbekov(a)gmail.com>\n" +"Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -163,7 +164,7 @@ msgstr "" #: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 msgid "Language" -msgstr "" +msgstr "Til" #: ../glade/langpanel.glade.h:3 msgid "Locale" @@ -196,7 +197,7 @@ msgid "" "%(stderr)s" msgstr "" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr ""

1 0

[tor-messenger-build/master] Update cert_override for jabber.ccc.de's new certificate
by sukhbir＠torproject.org 22 Oct '15

22 Oct '15

commit d61c0c6c0a77f9bff832dd874e469f226283d4a4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Oct 21 22:32:48 2015 -0400 Update cert_override for jabber.ccc.de's new certificate https://twitter.com/jabbercccde/status/655506307546533892 --- projects/instantbird/cert_override.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/cert_override.txt b/projects/instantbird/cert_override.txt index fbe9a6f..4e616f6 100644 --- a/projects/instantbird/cert_override.txt +++ b/projects/instantbird/cert_override.txt @@ -1,3 +1,3 @@ # PSM Certificate Override Settings file # This is a generated file! Do not edit. -jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 U AAAAAAAAAAAAAAADAAAAew308jB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw== +jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 59:2F:46:18:35:27:AB:40:83:88:82:AB:4C:B4:AE:F4:E2:CF:91:60:74:AB:01:F9:BC:24:39:31:CA:5C:4E:D1 U AAAAAAAAAAAAAAADAAAAexFL3TB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw==

1 0

[tor/master] Add another entry to ReleasingTor email list, per anonym
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 1a236c78aae1f832dd9813573d5a581ae8c69a50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 17:06:10 2015 -0400 Add another entry to ReleasingTor email list, per anonym --- doc/HACKING/ReleasingTor.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/HACKING/ReleasingTor.txt b/doc/HACKING/ReleasingTor.txt index 8321ac5..f95c02d 100644 --- a/doc/HACKING/ReleasingTor.txt +++ b/doc/HACKING/ReleasingTor.txt @@ -100,6 +100,7 @@ on dist-master. {paul} at invizbox dot io {ondrej.mikle} at gmail dot com {lfleischer} at archlinux dot org + {tails-dev} at doum dot org 10) Add the version number to Trac. To do this, go to Trac, log in, select "Admin" near the top of the screen, then select "Versions" from

1 0

[tor/master] Fix valgrind errors in test_util_process
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit ed0c2a5e3dec953d37736df6c86a81b4c74e108f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 16:51:21 2015 -0400 Fix valgrind errors in test_util_process --- src/test/test_util_process.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c index 0dcf047..04a21b8 100644 --- a/src/test/test_util_process.c +++ b/src/test/test_util_process.c @@ -24,21 +24,23 @@ static void test_util_process_set_waitpid_callback(void *ignored) { (void)ignored; - waitpid_callback_t *res; + waitpid_callback_t *res1 = NULL, *res2 = NULL; int previous_log = setup_capture_of_logs(LOG_WARN); pid_t pid = (pid_t)42; - res = set_waitpid_callback(pid, temp_callback, NULL); - tt_assert(res); + res1 = set_waitpid_callback(pid, temp_callback, NULL); + tt_assert(res1); - res = set_waitpid_callback(pid, temp_callback, NULL); - tt_assert(res); + res2 = set_waitpid_callback(pid, temp_callback, NULL); + tt_assert(res2); tt_str_op(mock_saved_log_at(0), OP_EQ, "Replaced a waitpid monitor on pid 42. That should be " "impossible.\n"); done: teardown_capture_of_logs(previous_log); + clear_waitpid_callback(res1); + clear_waitpid_callback(res2); } static void @@ -55,9 +57,12 @@ test_util_process_clear_waitpid_callback(void *ignored) clear_waitpid_callback(res); tt_int_op(mock_saved_log_number(), OP_EQ, 0); +#if 0 + /* No. This is use-after-free. We don't _do_ that. XXXX */ clear_waitpid_callback(res); tt_str_op(mock_saved_log_at(0), OP_EQ, "Couldn't remove waitpid monitor for pid 43.\n"); +#endif done: teardown_capture_of_logs(previous_log);

1 0

[tor/master] Add tests for util_process
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit cf4f50f94332615abcf6dd345ee1e8fce69232ca Author: Ola Bini <ola(a)olabini.se> Date: Tue Sep 15 17:37:25 2015 +0200 Add tests for util_process --- src/test/include.am | 2 + src/test/log_test_helpers.c | 95 ++++++++++++++++++++++++++++++++++++++++++ src/test/log_test_helpers.h | 27 ++++++++++++ src/test/test.c | 3 +- src/test/test_util_process.c | 67 +++++++++++++++++++++++++++++ 5 files changed, 193 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index f7c0204..0e584d4 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -51,6 +51,7 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ # matters a lot there, and is quite hard to debug if you forget to do it. src_test_test_SOURCES = \ + src/test/log_test_helpers.c \ src/test/test.c \ src/test/test_accounting.c \ src/test/test_addr.c \ @@ -96,6 +97,7 @@ src_test_test_SOURCES = \ src/test/test_status.c \ src/test/test_threads.c \ src/test/test_util.c \ + src/test/test_util_process.c \ src/test/test_helpers.c \ src/test/test_dns.c \ src/test/testing_common.c \ diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c new file mode 100644 index 0000000..42778d4 --- /dev/null +++ b/src/test/log_test_helpers.c @@ -0,0 +1,95 @@ +#define LOG_PRIVATE +#include "torlog.h" +#include "log_test_helpers.h" + +static smartlist_t *saved_logs = NULL; + +int +setup_capture_of_logs(int new_level) +{ + int previous_log = log_global_min_severity_; + log_global_min_severity_ = new_level; + mock_clean_saved_logs(); + MOCK(logv, mock_saving_logv); + return previous_log; +} + +void +teardown_capture_of_logs(int prev) +{ + UNMOCK(logv); + log_global_min_severity_ = prev; + mock_clean_saved_logs(); +} + +void +mock_clean_saved_logs(void) +{ + if (!saved_logs) + return; + SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m, + { tor_free(m->generated_msg); tor_free(m); }); + smartlist_free(saved_logs); + saved_logs = NULL; +} + +char * +mock_saved_log_at(int ix) +{ + int saved_log_count = mock_saved_log_number(); + if(ix < 0) { + ix = saved_log_count + ix; + } + + if (saved_log_count <= ix) + return ""; + return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->generated_msg; +} + +int +mock_saved_severity_at(int ix) +{ + int saved_log_count = mock_saved_log_number(); + if(ix < 0) { + ix = saved_log_count + ix; + } + + if (saved_log_count <= ix) + return -1; + return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->severity; +} + +int +mock_saved_log_number(void) +{ + if (!saved_logs) + return 0; + return smartlist_len(saved_logs); +} + +const smartlist_t * +mock_saved_logs(void) +{ + return saved_logs; +} + +void +mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) +{ + char *buf = tor_malloc_zero(10240); + int n; + n = tor_vsnprintf(buf,10240,format,ap); + buf[n]='\n'; + buf[n+1]='\0'; + + mock_saved_log_entry_t *e = tor_malloc_zero(sizeof(mock_saved_log_entry_t)); + e->severity = severity; + e->funcname = funcname; + e->suffix = suffix; + e->format = format; + e->generated_msg = buf; + + if (!saved_logs) + saved_logs = smartlist_new(); + smartlist_add(saved_logs, e); +} diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h new file mode 100644 index 0000000..789bfe4 --- /dev/null +++ b/src/test/log_test_helpers.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2014-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "or.h" + +#ifndef TOR_LOG_TEST_HELPERS_H +#define TOR_LOG_TEST_HELPERS_H + +typedef struct mock_saved_log_entry_t { + int severity; + const char *funcname; + const char *suffix; + const char *format; + char *generated_msg; + struct mock_saved_log_entry_t *next; +} mock_saved_log_entry_t; + +void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap); +void mock_clean_saved_logs(void); +const smartlist_t *mock_saved_logs(void); +int setup_capture_of_logs(int new_level); +void teardown_capture_of_logs(int prev); +char *mock_saved_log_at(int ix); +int mock_saved_severity_at(int ix); +int mock_saved_log_number(void); + +#endif diff --git a/src/test/test.c b/src/test/test.c index e10e260..a431538 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1158,6 +1158,7 @@ extern struct testcase_t socks_tests[]; extern struct testcase_t status_tests[]; extern struct testcase_t thread_tests[]; extern struct testcase_t util_tests[]; +extern struct testcase_t util_process_tests[]; extern struct testcase_t dns_tests[]; struct testgroup_t testgroups[] = { @@ -1204,8 +1205,8 @@ struct testgroup_t testgroups[] = { { "status/" , status_tests }, { "util/", util_tests }, { "util/logging/", logging_tests }, + { "util/process/", util_process_tests }, { "util/thread/", thread_tests }, { "dns/", dns_tests }, END_OF_GROUPS }; - diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c new file mode 100644 index 0000000..5d6c072 --- /dev/null +++ b/src/test/test_util_process.c @@ -0,0 +1,67 @@ +/* Copyright (c) 2010-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define UTIL_PROCESS_PRIVATE +#include "orconfig.h" +#include "or.h" + +#include "test.h" + +#include "util_process.h" + +#include "log_test_helpers.h" + +#define NS_MODULE util_process + +static +void temp_callback(int r, void *s) +{ + (void)r; + (void)s; +} + +static void +test_util_process_set_waitpid_callback(void *ignored) +{ + (void)ignored; + waitpid_callback_t *res; + int previous_log = setup_capture_of_logs(LOG_WARN); + pid_t pid = (pid_t)42; + + res = set_waitpid_callback(pid, temp_callback, NULL); + tt_assert(res); + + res = set_waitpid_callback(pid, temp_callback, NULL); + tt_assert(res); + tt_str_op(mock_saved_log_at(0), OP_EQ, "Replaced a waitpid monitor on pid 42. That should be impossible.\n"); + + done: + teardown_capture_of_logs(previous_log); +} + + +static void +test_util_process_clear_waitpid_callback(void *ignored) +{ + (void)ignored; + waitpid_callback_t *res; + int previous_log = setup_capture_of_logs(LOG_WARN); + pid_t pid = (pid_t)43; + + clear_waitpid_callback(NULL); + + res = set_waitpid_callback(pid, temp_callback, NULL); + clear_waitpid_callback(res); + clear_waitpid_callback(res); + + // done: + teardown_capture_of_logs(previous_log); +} + + + +struct testcase_t util_process_tests[] = { + { "set_waitpid_callback", test_util_process_set_waitpid_callback, 0, NULL, NULL }, + { "clear_waitpid_callback", test_util_process_clear_waitpid_callback, 0, NULL, NULL }, + END_OF_TESTCASES +};

1 0

[tor/master] Merge remote-tracking branch 'twstrike/util_process_tests'
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit a61158aa237429d046f34d9f3db5a7dc7c40ba5e Merge: 5e9f238 c31791b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 16:45:49 2015 -0400 Merge remote-tracking branch 'twstrike/util_process_tests' src/test/include.am | 1 + src/test/test.c | 3 +- src/test/test_util_process.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --cc src/test/include.am index 5b3c045,0e584d4..d0a819f --- a/src/test/include.am +++ b/src/test/include.am @@@ -99,11 -96,10 +99,12 @@@ src_test_test_SOURCES = src/test/test_socks.c \ src/test/test_status.c \ src/test/test_threads.c \ + src/test/test_tortls.c \ src/test/test_util.c \ + src/test/test_util_format.c \ + src/test/test_util_process.c \ src/test/test_helpers.c \ - src/test/test_dns.c \ + src/test/test_dns.c \ src/test/testing_common.c \ src/ext/tinytest.c diff --cc src/test/test.c index 3468f7f,a431538..1c421d9 --- a/src/test/test.c +++ b/src/test/test.c @@@ -1165,9 -1157,8 +1165,10 @@@ extern struct testcase_t scheduler_test extern struct testcase_t socks_tests[]; extern struct testcase_t status_tests[]; extern struct testcase_t thread_tests[]; +extern struct testcase_t tortls_tests[]; extern struct testcase_t util_tests[]; +extern struct testcase_t util_format_tests[]; + extern struct testcase_t util_process_tests[]; extern struct testcase_t dns_tests[]; struct testgroup_t testgroups[] = { @@@ -1216,10 -1203,9 +1217,11 @@@ { "scheduler/", scheduler_tests }, { "socks/", socks_tests }, { "status/" , status_tests }, + { "tortls/", tortls_tests }, { "util/", util_tests }, + { "util/format/", util_format_tests }, { "util/logging/", logging_tests }, + { "util/process/", util_process_tests }, { "util/thread/", thread_tests }, { "dns/", dns_tests }, END_OF_GROUPS

1 0

[tor/master] Test behavior on success, and fix spaces
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit c31791b79886dd697f02af78b86281ad6d5e407d Author: Ola Bini <ola(a)olabini.se> Date: Mon Oct 5 14:07:55 2015 -0500 Test behavior on success, and fix spaces --- src/test/log_test_helpers.c | 13 ++++++++----- src/test/log_test_helpers.h | 6 ++++-- src/test/test_util_process.c | 23 ++++++++++++++--------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 42778d4..7dae488 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -33,24 +33,25 @@ mock_clean_saved_logs(void) saved_logs = NULL; } -char * +const char * mock_saved_log_at(int ix) { int saved_log_count = mock_saved_log_number(); - if(ix < 0) { + if (ix < 0) { ix = saved_log_count + ix; } if (saved_log_count <= ix) return ""; - return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->generated_msg; + return ((mock_saved_log_entry_t *) + smartlist_get(saved_logs, ix))->generated_msg; } int mock_saved_severity_at(int ix) { int saved_log_count = mock_saved_log_number(); - if(ix < 0) { + if (ix < 0) { ix = saved_log_count + ix; } @@ -74,8 +75,10 @@ mock_saved_logs(void) } void -mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) +mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, + const char *suffix, const char *format, va_list ap) { + (void)domain; char *buf = tor_malloc_zero(10240); int n; n = tor_vsnprintf(buf,10240,format,ap); diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 789bfe4..58d14d9 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -15,12 +15,14 @@ typedef struct mock_saved_log_entry_t { struct mock_saved_log_entry_t *next; } mock_saved_log_entry_t; -void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap); +void mock_saving_logv(int severity, log_domain_mask_t domain, + const char *funcname, const char *suffix, + const char *format, va_list ap); void mock_clean_saved_logs(void); const smartlist_t *mock_saved_logs(void); int setup_capture_of_logs(int new_level); void teardown_capture_of_logs(int prev); -char *mock_saved_log_at(int ix); +const char *mock_saved_log_at(int ix); int mock_saved_severity_at(int ix); int mock_saved_log_number(void); diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c index 5d6c072..5d45b58 100644 --- a/src/test/test_util_process.c +++ b/src/test/test_util_process.c @@ -13,8 +13,8 @@ #define NS_MODULE util_process -static -void temp_callback(int r, void *s) +static void +temp_callback(int r, void *s) { (void)r; (void)s; @@ -33,13 +33,14 @@ test_util_process_set_waitpid_callback(void *ignored) res = set_waitpid_callback(pid, temp_callback, NULL); tt_assert(res); - tt_str_op(mock_saved_log_at(0), OP_EQ, "Replaced a waitpid monitor on pid 42. That should be impossible.\n"); + tt_str_op(mock_saved_log_at(0), OP_EQ, + "Replaced a waitpid monitor on pid 42. That should be " + "impossible.\n"); done: teardown_capture_of_logs(previous_log); } - static void test_util_process_clear_waitpid_callback(void *ignored) { @@ -52,16 +53,20 @@ test_util_process_clear_waitpid_callback(void *ignored) res = set_waitpid_callback(pid, temp_callback, NULL); clear_waitpid_callback(res); + tt_int_op(mock_saved_log_number(), OP_EQ, 0); + clear_waitpid_callback(res); + tt_str_op(mock_saved_log_at(0), OP_EQ, + "Couldn't remove waitpid monitor for pid 43.\n"); - // done: + done: teardown_capture_of_logs(previous_log); } - - struct testcase_t util_process_tests[] = { - { "set_waitpid_callback", test_util_process_set_waitpid_callback, 0, NULL, NULL }, - { "clear_waitpid_callback", test_util_process_clear_waitpid_callback, 0, NULL, NULL }, + { "set_waitpid_callback", test_util_process_set_waitpid_callback, 0, + NULL, NULL }, + { "clear_waitpid_callback", test_util_process_clear_waitpid_callback, 0, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Fix whitespaces
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 5431c60001d5051184c2cac2fd4511346a1f1bd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 16:46:28 2015 -0400 Fix whitespaces --- src/test/test.c | 1 + src/test/test_dir_handle_get.c | 2 +- src/test/test_util_process.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index 1c421d9..44171b5 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1226,3 +1226,4 @@ struct testgroup_t testgroups[] = { { "dns/", dns_tests }, END_OF_GROUPS }; + diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 486d5d3..2e5a50a 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2399,7 +2399,7 @@ test_dir_handle_get_status_vote_next_authority(void* data) tor_free(body); authority_cert_free(mock_cert); mock_cert = NULL; or_options_free(mock_options); mock_options = NULL; - + clear_dir_servers(); routerlist_free_all(); dirvote_free_all(); diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c index 5d45b58..0dcf047 100644 --- a/src/test/test_util_process.c +++ b/src/test/test_util_process.c @@ -70,3 +70,4 @@ struct testcase_t util_process_tests[] = { NULL, NULL }, END_OF_TESTCASES }; +

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2015