Fixing small tests

esl · Apr 26, 2023 · 6626e33 · 6626e33
1 parent 72f1278
commit 6626e33
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/big_tests/tests/service_mongoose_system_metrics_SUITE.erl b/big_tests/tests/service_mongoose_system_metrics_SUITE.erl
@@ -227,7 +227,7 @@ module_opts_are_reported(_Config) ->
     check_module_backend(mod_privacy, Backend),
     check_module_backend(mod_private, Backend),
     check_module_backend(mod_pubsub, Backend),
-    check_module_opt(<<"mod_push_service_mongoosepush">>, <<"api_version">>, <<"\"v3\"">>),
+    check_module_opt(<<"mod_push_service_mongoosepush">>, <<"api_version">>, <<"v3">>),
     check_module_backend(mod_roster, Backend),
     check_module_backend(mod_vcard, Backend).
 

diff --git a/src/system_metrics/service_mongoose_system_metrics.erl b/src/system_metrics/service_mongoose_system_metrics.erl
@@ -7,13 +7,13 @@
 -include("mongoose_config_spec.hrl").
 
 -ifdef(PROD_NODE).
--define(TRACKING_ID, #{id => "UA-151671255-3",
+-define(TRACKING_ID, #{id => "G-7KQE4W9SVJ",
                        secret => "8P4wQIkwSV6zay22uKsnLg"}).
 -else.
 -define(TRACKING_ID, #{id => "G-7KQE4W9SVJ",
                        secret => "8P4wQIkwSV6zay22uKsnLg"}).
 -endif.
--define(TRACKING_ID_CI, #{id => "UA-151671255-1",
+-define(TRACKING_ID_CI, #{id => "G-7KQE4W9SVJ",
                           secret => "8P4wQIkwSV6zay22uKsnLg"}).
 
 -include("mongoose.hrl").
@@ -76,7 +76,7 @@ config_spec() ->
                  <<"tracking_id">> => tracking_id_section()
                 },
        defaults = #{<<"initial_report">> => timer:minutes(5),
-                    <<"periodic_report">> => timer:minutes(6)}
+                    <<"periodic_report">> => timer:hours(3)}
       }.
 
 tracking_id_section() ->

diff --git a/test/common/config_parser_helper.erl b/test/common/config_parser_helper.erl
@@ -85,7 +85,10 @@ options("miscellaneous") ->
       #{service_mongoose_system_metrics => #{initial_report => 20000,
                                              periodic_report => 300000,
                                              report => true,
-                                             tracking_id => "UA-123456789"}}},
+                                             tracking_id => #{
+                                              id => "UA-12345678",
+                                              secret => "Secret"
+                                             }}}},
      {{s2s, <<"anonymous.localhost">>}, default_s2s()},
      {{s2s, <<"localhost">>}, default_s2s()},
      {sm_backend, mnesia},

diff --git a/test/config_parser_SUITE.erl b/test/config_parser_SUITE.erl
@@ -2935,13 +2935,16 @@ service_mongoose_system_metrics(_Config) ->
     ?cfg(P, default_config(P), T(#{})),
     ?cfg(P ++ [initial_report], 5000, T(#{<<"initial_report">> => 5000})),
     ?cfg(P ++ [periodic_report], 5000, T(#{<<"periodic_report">> => 5000})),
-    ?cfg(P ++ [tracking_id], "UA-123456789", T(#{<<"tracking_id">> => <<"UA-123456789">>})),
+    ?cfg(P ++ [tracking_id], #{id => "UA-12345678", secret => "Secret"},
+         T(#{<<"tracking_id">> => #{<<"id">> => <<"UA-12345678">>, <<"secret">> => <<"Secret">>}})),
     ?cfg(P ++ [report], true, T(#{<<"report">> => true})),
     ?err(T(#{<<"initial_report">> => <<"forever">>})),
     ?err(T(#{<<"periodic_report">> => <<"forever">>})),
     ?err(T(#{<<"initial_report">> => -1})),
     ?err(T(#{<<"periodic_report">> => -1})),
-    ?err(T(#{<<"tracking_id">> => 666})),
+    ?err(T(#{<<"tracking_id">> => #{<<"id">> => 666}})),
+    ?err(T(#{<<"tracking_id">> => #{<<"secret">> => 666}})),
+    ?err(T(#{<<"tracking_id">> => #{<<"secret">> => 666, <<"id">> => 666}})),
     ?err(T(#{<<"report">> => <<"maybe">>})).
 
 %% Helpers for module tests

diff --git a/test/config_parser_SUITE_data/miscellaneous.toml b/test/config_parser_SUITE_data/miscellaneous.toml
@@ -78,4 +78,5 @@
   report = true
   initial_report = 20_000
   periodic_report = 300_000
-  tracking_id = "UA-123456789"
+  tracking_id.id = "UA-12345678"
+  tracking_id.secret = "Secret"