[tor-commits] [tor/release-0.3.3] tests: Run all existing protover tests in both languages.

[nickm@xxxxxxxxxxxxxx]

commit 6739a69c590a12af0f1cb2af62972f4305803670
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Tue Mar 27 21:36:10 2018 +0000

    tests: Run all existing protover tests in both languages.
    
    There's now no difference in these tests w.r.t. the C or Rust: both
    fail miserably (well, Rust fails with nice descriptive errors, and C
    gives you a traceback, because, well, C).
---
 src/test/test_protover.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index e7e17efe3..7bf1471eb 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -283,23 +283,22 @@ test_protover_all_supported(void *arg)
   tt_str_op(msg, OP_EQ, "Sleen=0-4294967294");
   tor_free(msg);
 
-  /* If we get an unparseable list, we say "yes, that's supported." */
-#ifndef HAVE_RUST
-  // XXXX let's make this section unconditional: rust should behave the
-  // XXXX same as C here!
+  /* If we get a (barely) valid (but unsupported list, we say "yes, that's
+   * supported." */
+  tt_assert(protover_all_supported("Fribble=", &msg));
+  tt_ptr_op(msg, OP_EQ, NULL);
+
+  /* If we get a completely unparseable list, protover_all_supported should
+   * hit a fatal assertion for BUG(entries == NULL). */
   tor_capture_bugs_(1);
   tt_assert(protover_all_supported("Fribble", &msg));
-  tt_ptr_op(msg, OP_EQ, NULL);
   tor_end_capture_bugs_();
 
-  /* This case is forbidden. Since it came from a protover_all_supported,
-   * it can trigger a bug message.  */
+  /* If we get a completely unparseable list, protover_all_supported should
+   * hit a fatal assertion for BUG(entries == NULL). */
   tor_capture_bugs_(1);
   tt_assert(protover_all_supported("Sleen=0-4294967295", &msg));
-  tt_ptr_op(msg, OP_EQ, NULL);
-  tor_free(msg);
   tor_end_capture_bugs_();
-#endif
 
  done:
   tor_end_capture_bugs_();



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits