summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-26 09:44:16 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-26 09:44:16 -0400
commitfdb7fc70d03d21d967db4928960241a624483a24 (patch)
tree81bc0382688d4e10d9a0ff2cc99024e0fdaf3d52 /src/test
parent72ba1739e2bf93d022e93fc2100650e300ad1e4d (diff)
parent051dd9c409d9d7e841a3d818036f733f08a38d88 (diff)
downloadtor-fdb7fc70d03d21d967db4928960241a624483a24.tar.gz
tor-fdb7fc70d03d21d967db4928960241a624483a24.zip
Merge remote-tracking branch 'public/bug10163'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_dir.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index c03b63be27..71b474d493 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -736,10 +736,6 @@ test_dir_param_voting(void)
/* Do the first tests without adding all the other votes, for
* networks without many dirauths. */
- res = dirvote_compute_params(votes, 11, 6);
- test_streq(res, "ab=90 abcd=20 cw=50 x-yz=-99");
- tor_free(res);
-
res = dirvote_compute_params(votes, 12, 2);
test_streq(res, "");
tor_free(res);
@@ -750,10 +746,6 @@ test_dir_param_voting(void)
smartlist_add(votes, &vote2);
- res = dirvote_compute_params(votes, 11, 2);
- test_streq(res, "ab=27 abcd=20 cw=5 x-yz=-99");
- tor_free(res);
-
res = dirvote_compute_params(votes, 12, 2);
test_streq(res, "ab=27 cw=5 x-yz=-99");
tor_free(res);
@@ -768,10 +760,6 @@ test_dir_param_voting(void)
smartlist_add(votes, &vote3);
- res = dirvote_compute_params(votes, 11, 3);
- test_streq(res, "ab=27 abcd=20 c=60 cw=50 x-yz=-9 zzzzz=101");
- tor_free(res);
-
res = dirvote_compute_params(votes, 12, 3);
test_streq(res, "ab=27 abcd=20 cw=50 x-yz=-9");
tor_free(res);
@@ -786,10 +774,6 @@ test_dir_param_voting(void)
smartlist_add(votes, &vote4);
- res = dirvote_compute_params(votes, 11, 4);
- test_streq(res, "ab=90 abcd=20 c=1 cw=50 x-yz=-9 zzzzz=101");
- tor_free(res);
-
res = dirvote_compute_params(votes, 12, 4);
test_streq(res, "ab=90 abcd=20 cw=50 x-yz=-9");
tor_free(res);