[tor-commits] [tor/master] test: Add test for onion service metrics module

[ahf@xxxxxxxxxxxxxx]

commit 238340ce54d1e0b2b7ef593697b971e951d9bd23
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Fri Oct 23 13:19:38 2020 -0400

    test: Add test for onion service metrics module
    
    Related to #40063
    
    Signed-off-by: David Goulet <dgoulet@xxxxxxxxxxxxxx>
---
 src/test/include.am        |  1 +
 src/test/test.c            |  1 +
 src/test/test.h            |  1 +
 src/test/test_hs_metrics.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+)

diff --git a/src/test/include.am b/src/test/include.am
index 5149416044..cdf3b20c48 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -195,6 +195,7 @@ src_test_test_SOURCES += \
 	src/test/test_hs_cache.c \
 	src/test/test_hs_descriptor.c \
 	src/test/test_hs_dos.c \
+	src/test/test_hs_metrics.c \
 	src/test/test_introduce.c \
 	src/test/test_keypin.c \
 	src/test/test_link_handshake.c \
diff --git a/src/test/test.c b/src/test/test.c
index 9e0fc4433b..ffea158141 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -730,6 +730,7 @@ struct testgroup_t testgroups[] = {
   { "hs_descriptor/", hs_descriptor },
   { "hs_dos/", hs_dos_tests },
   { "hs_intropoint/", hs_intropoint_tests },
+  { "hs_metrics/", hs_metrics_tests },
   { "hs_ntor/", hs_ntor_tests },
   { "hs_ob/", hs_ob_tests },
   { "hs_service/", hs_service_tests },
diff --git a/src/test/test.h b/src/test/test.h
index ba1d69fa11..56037648d3 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -141,6 +141,7 @@ extern struct testcase_t hs_control_tests[];
 extern struct testcase_t hs_descriptor[];
 extern struct testcase_t hs_dos_tests[];
 extern struct testcase_t hs_intropoint_tests[];
+extern struct testcase_t hs_metrics_tests[];
 extern struct testcase_t hs_ntor_tests[];
 extern struct testcase_t hs_ob_tests[];
 extern struct testcase_t hs_service_tests[];
diff --git a/src/test/test_hs_metrics.c b/src/test/test_hs_metrics.c
new file mode 100644
index 0000000000..dd123eb6f1
--- /dev/null
+++ b/src/test/test_hs_metrics.c
@@ -0,0 +1,68 @@
+/* Copyright (c) 2020, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file test_hs_metrics.c
+ * \brief Test hidden service metrics.
+ */
+
+#define HS_SERVICE_PRIVATE
+
+#include "test/test.h"
+#include "test/test_helpers.h"
+#include "test/log_test_helpers.h"
+
+#include "app/config/config.h"
+
+#include "feature/hs/hs_metrics.h"
+#include "feature/hs/hs_service.h"
+
+#include "lib/crypt_ops/crypto_ed25519.h"
+
+static void
+test_metrics(void *arg)
+{
+  hs_service_t *service = NULL;
+
+  (void) arg;
+
+  hs_init();
+
+  service = hs_service_new(get_options());
+  tt_assert(service);
+  service->config.version = HS_VERSION_THREE;
+  ed25519_secret_key_generate(&service->keys.identity_sk, 0);
+  ed25519_public_key_generate(&service->keys.identity_pk,
+                              &service->keys.identity_sk);
+  register_service(get_hs_service_map(), service);
+
+  tt_assert(service->metrics.store);
+
+  /* Update entry by identifier. */
+  hs_metrics_update_by_ident(HS_METRICS_NUM_INTRODUCTIONS,
+                             &service->keys.identity_pk, 0, 42);
+
+  /* Confirm the entry value. */
+  const smartlist_t *entries = metrics_store_get_all(service->metrics.store,
+                                                     "hs_intro_num_total");
+  tt_assert(entries);
+  tt_int_op(smartlist_len(entries), OP_EQ, 1);
+  const metrics_store_entry_t *entry = smartlist_get(entries, 0);
+  tt_assert(entry);
+  tt_int_op(metrics_store_entry_get_value(entry), OP_EQ, 42);
+
+  /* Update entry by service now. */
+  hs_metrics_update_by_service(HS_METRICS_NUM_INTRODUCTIONS,
+                               service, 0, 42);
+  tt_int_op(metrics_store_entry_get_value(entry), OP_EQ, 84);
+
+ done:
+  hs_free_all();
+}
+
+struct testcase_t hs_metrics_tests[] = {
+
+  { "metrics", test_metrics, TT_FORK, NULL, NULL },
+
+  END_OF_TESTCASES
+};



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