premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

make test_ssl less likely to fail spuriously

This commit is contained in:
Arvid Norberg 2018-08-02 11:42:59 +02:00 committed by Arvid Norberg
parent 70d64327fd
commit 149c24e549
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/test_ssl.cpp
View File

@ -74,7 +74,7 @@ struct test_config_t
int ssl_disconnects; int ssl_disconnects;
}; };
test_config_t test_config[] = test_config_t const test_config[] =
{ {
// name sslport sd-cert dl-cert dl-port expect peer-error ssl-disconn // name sslport sd-cert dl-cert dl-port expect peer-error ssl-disconn
{"nobody has a cert (connect to regular port)", false, false, false, true, false, 0, 1}, {"nobody has a cert (connect to regular port)", false, false, false, true, false, 0, 1},
@ -114,7 +114,7 @@ bool on_alert(alert const* a)
return false; return false;
} }
void test_ssl(int test_idx, bool use_utp) void test_ssl(int const test_idx, bool const use_utp)
{ {
// these are declared before the session objects // these are declared before the session objects
// so that they are destructed last. This enables // so that they are destructed last. This enables
@ -281,10 +281,13 @@ void test_ssl(int test_idx, bool use_utp)
fprintf(stderr, "peer_errors: %d expected_errors: %d\n" fprintf(stderr, "peer_errors: %d expected_errors: %d\n"
, peer_errors, test.peer_errors); , peer_errors, test.peer_errors);
TEST_EQUAL(peer_errors > 0, test.peer_errors > 0);
fprintf(stderr, "ssl_disconnects: %d expected: %d\n", ssl_peer_disconnects, test.ssl_disconnects); fprintf(stderr, "ssl_disconnects: %d expected: %d\n", ssl_peer_disconnects, test.ssl_disconnects);
TEST_EQUAL(ssl_peer_disconnects > 0, test.ssl_disconnects > 0); if (!use_utp)
{
TEST_EQUAL(ssl_peer_disconnects > 0, test.ssl_disconnects > 0);
TEST_EQUAL(peer_errors > 0, test.peer_errors > 0);
}
fprintf(stderr, "%s: EXPECT: %s\n", time_now_string(), test.expected_to_complete ? "SUCCEESS" : "FAILURE"); fprintf(stderr, "%s: EXPECT: %s\n", time_now_string(), test.expected_to_complete ? "SUCCEESS" : "FAILURE");
fprintf(stderr, "%s: RESULT: %s\n", time_now_string(), tor2.status().is_seeding ? "SUCCEESS" : "FAILURE"); fprintf(stderr, "%s: RESULT: %s\n", time_now_string(), tor2.status().is_seeding ? "SUCCEESS" : "FAILURE");
@ -319,7 +322,7 @@ enum attack_flags_t
valid_bittorrent_hash = 16, valid_bittorrent_hash = 16,
}; };
attack_t attacks[] = attack_t const attacks[] =
{ {
// positive test // positive test
{ valid_certificate | valid_sni_hash | valid_bittorrent_hash, true}, { valid_certificate | valid_sni_hash | valid_bittorrent_hash, true},