From fafd1ec23e8001dc7bdf87f2aa1f59051e33224d Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Fri, 22 Nov 2024 00:02:40 +0000 Subject: Fix event log command event hierarchy. command should be cmd_name, to match what git is emitting. This also fixes arguments, so that only relevant arguments are passed instead of the entire sys.args, which will contain wrapper information Change-Id: Id436accfff511292ec2c56798fffb2306dda38fc Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/443741 Commit-Queue: Josip Sokcevic Reviewed-by: Gavin Mak Tested-by: Josip Sokcevic --- tests/test_git_trace2_event_log.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'tests/test_git_trace2_event_log.py') diff --git a/tests/test_git_trace2_event_log.py b/tests/test_git_trace2_event_log.py index 4658a793..d3214887 100644 --- a/tests/test_git_trace2_event_log.py +++ b/tests/test_git_trace2_event_log.py @@ -150,7 +150,7 @@ class EventLogTestCase(unittest.TestCase): """ - self._event_log_module.StartEvent() + self._event_log_module.StartEvent([]) with tempfile.TemporaryDirectory(prefix="event_log_tests") as tempdir: log_path = self._event_log_module.Write(path=tempdir) self._log_data = self.readLog(log_path) @@ -213,10 +213,8 @@ class EventLogTestCase(unittest.TestCase): """ - name = "repo" - subcommands = ["init" "this"] self._event_log_module.CommandEvent( - name="repo", subcommands=subcommands + name="repo", subcommands=["init", "this"] ) with tempfile.TemporaryDirectory(prefix="event_log_tests") as tempdir: log_path = self._event_log_module.Write(path=tempdir) @@ -225,12 +223,10 @@ class EventLogTestCase(unittest.TestCase): self.assertEqual(len(self._log_data), 2) command_event = self._log_data[1] self.verifyCommonKeys(self._log_data[0], expected_event_name="version") - self.verifyCommonKeys(command_event, expected_event_name="command") + self.verifyCommonKeys(command_event, expected_event_name="cmd_name") # Check for 'command' event specific fields. self.assertIn("name", command_event) - self.assertIn("subcommands", command_event) - self.assertEqual(command_event["name"], name) - self.assertEqual(command_event["subcommands"], subcommands) + self.assertEqual(command_event["name"], "repo-init-this") def test_def_params_event_repo_config(self): """Test 'def_params' event data outputs only repo config keys. @@ -382,17 +378,17 @@ class EventLogTestCase(unittest.TestCase): socket_path = os.path.join(tempdir, "server.sock") server_ready = threading.Condition() # Start "server" listening on Unix domain socket at socket_path. + server_thread = threading.Thread( + target=serverLoggingThread, + args=(socket_path, server_ready, received_traces), + ) try: - server_thread = threading.Thread( - target=serverLoggingThread, - args=(socket_path, server_ready, received_traces), - ) server_thread.start() with server_ready: server_ready.wait(timeout=120) - self._event_log_module.StartEvent() + self._event_log_module.StartEvent([]) path = self._event_log_module.Write( path=f"af_unix:{socket_path}" ) -- cgit v1.2.3-54-g00ecf