diff options
author | dubslow <bunslow@gmail.com> | 2014-09-28 12:37:47 -0500 |
---|---|---|
committer | dubslow <bunslow@gmail.com> | 2014-09-28 12:37:47 -0500 |
commit | 57666d95bac5e070acda74020f5faca88cfa4bd5 (patch) | |
tree | 7dd17305a43ce332984034a1dec783d8e96ac780 /auto_tests | |
parent | 3711b881cb6f64cf08209f70216ec75672464d1a (diff) | |
parent | 72d6a92efd8cad191282c8a2e294a768c49d5f25 (diff) |
Merge branch 'master' of https://github.com/irungentoo/toxcore
Diffstat (limited to 'auto_tests')
-rw-r--r-- | auto_tests/network_test.c | 10 | ||||
-rw-r--r-- | auto_tests/onion_test.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c index 9d07fbb4..c1ac8084 100644 --- a/auto_tests/network_test.c +++ b/auto_tests/network_test.c | |||
@@ -134,22 +134,12 @@ START_TEST(test_ip_equal) | |||
134 | } | 134 | } |
135 | END_TEST | 135 | END_TEST |
136 | 136 | ||
137 | START_TEST(test_struct_sizes) | ||
138 | { | ||
139 | ck_assert_msg(sizeof(IP4) == 4, "sizeof(IP4): expected result 4, got %u.", sizeof(IP4)); | ||
140 | ck_assert_msg(sizeof(IP6) == 16, "sizeof(IP6): expected result 16, got %u.", sizeof(IP6)); | ||
141 | ck_assert_msg(sizeof(IP) == 17, "sizeof(IP): expected result 17, got %u.", sizeof(IP)); | ||
142 | ck_assert_msg(sizeof(IP_Port) == 19, "sizeof(IP_Port): expected result 19, got %u.", sizeof(IP_Port)); | ||
143 | } | ||
144 | END_TEST | ||
145 | |||
146 | Suite *network_suite(void) | 137 | Suite *network_suite(void) |
147 | { | 138 | { |
148 | Suite *s = suite_create("Network"); | 139 | Suite *s = suite_create("Network"); |
149 | 140 | ||
150 | DEFTESTCASE(addr_resolv_localhost); | 141 | DEFTESTCASE(addr_resolv_localhost); |
151 | DEFTESTCASE(ip_equal); | 142 | DEFTESTCASE(ip_equal); |
152 | DEFTESTCASE(struct_sizes); | ||
153 | 143 | ||
154 | return s; | 144 | return s; |
155 | } | 145 | } |
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c index 29f91308..3b8e0603 100644 --- a/auto_tests/onion_test.c +++ b/auto_tests/onion_test.c | |||
@@ -342,7 +342,7 @@ Suite *onion_suite(void) | |||
342 | Suite *s = suite_create("Onion"); | 342 | Suite *s = suite_create("Onion"); |
343 | 343 | ||
344 | DEFTESTCASE_SLOW(basic, 5); | 344 | DEFTESTCASE_SLOW(basic, 5); |
345 | DEFTESTCASE_SLOW(announce, 50); | 345 | //DEFTESTCASE_SLOW(announce, 50); //TODO: fix test. |
346 | return s; | 346 | return s; |
347 | } | 347 | } |
348 | 348 | ||