update according to review comments

big_tests/tests/gdpr_SUITE.erl

@@ -256,13 +256,13 @@ retrieve_inbox(Config) ->
 retrieve_logs(Config) ->
     escalus:fresh_story(Config, [{alice, 1}],
         fun(Alice) ->
-            User = escalus_client:username(Alice),
-            Domain = escalus_client:server(Alice),
-            JID = binary_to_list(User) ++ "@" ++ binary_to_list(Domain),
+            User = string:lowercase(escalus_client:username(Alice)),
+            Domain = string:lowercase(escalus_client:server(Alice)),
+            JID = string:uppercase(escalus_client:short_jid(Alice)),
             MIM2Node = distributed_helper:mim2(),
             mongoose_helper:successful_rpc(net_kernel, connect_node, [MIM2Node]),
             mongoose_helper:successful_rpc(MIM2Node, error_logger, error_msg,
-                                           ["event=disturbance_in_the_force, jid=" ++ JID, []]),
+                                           ["event=disturbance_in_the_force, jid=~s", [JID]]),
             Dir = request_and_unzip_personal_data(User, Domain, Config),
             Filename = filename:join(Dir, "logs-" ++ atom_to_list(MIM2Node) ++ ".txt"),
             {ok, Content} = file:read_file(Filename),

src/admin_extra/service_admin_extra_gdpr.erl

@@ -6,6 +6,8 @@
          retrieve_all/3,
          retrieve_logs/2]).
 
+-define(CMD_TIMEOUT, 300000).
+
 -spec commands() -> [ejabberd_commands:cmd()].
 commands() -> [
         #ejabberd_commands{name = retrieve_personal_data, tags = [gdpr],
@@ -89,7 +91,7 @@ get_logs(Username, Domain, TmpDir) ->
     FileName = "logs-" ++ atom_to_list(node()) ++ ".txt",
     FilePath = TmpDir ++ "/" ++ FileName,
     Args = [FilePath, Username, Domain | FileList],
-    0 = run(Cmd, Args, 300000),
+    0 = run(Cmd, Args, ?CMD_TIMEOUT),
     FileName.
 
 -spec get_logs_from_node(node(), gdpr:username(), gdpr:domain(), file:name()) -> file:name().