summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_git_trace2_event_log.py22
1 files changed, 9 insertions, 13 deletions
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):
150 <version event> 150 <version event>
151 <start event> 151 <start event>
152 """ 152 """
153 self._event_log_module.StartEvent() 153 self._event_log_module.StartEvent([])
154 with tempfile.TemporaryDirectory(prefix="event_log_tests") as tempdir: 154 with tempfile.TemporaryDirectory(prefix="event_log_tests") as tempdir:
155 log_path = self._event_log_module.Write(path=tempdir) 155 log_path = self._event_log_module.Write(path=tempdir)
156 self._log_data = self.readLog(log_path) 156 self._log_data = self.readLog(log_path)
@@ -213,10 +213,8 @@ class EventLogTestCase(unittest.TestCase):
213 <version event> 213 <version event>
214 <command event> 214 <command event>
215 """ 215 """
216 name = "repo"
217 subcommands = ["init" "this"]
218 self._event_log_module.CommandEvent( 216 self._event_log_module.CommandEvent(
219 name="repo", subcommands=subcommands 217 name="repo", subcommands=["init", "this"]
220 ) 218 )
221 with tempfile.TemporaryDirectory(prefix="event_log_tests") as tempdir: 219 with tempfile.TemporaryDirectory(prefix="event_log_tests") as tempdir:
222 log_path = self._event_log_module.Write(path=tempdir) 220 log_path = self._event_log_module.Write(path=tempdir)
@@ -225,12 +223,10 @@ class EventLogTestCase(unittest.TestCase):
225 self.assertEqual(len(self._log_data), 2) 223 self.assertEqual(len(self._log_data), 2)
226 command_event = self._log_data[1] 224 command_event = self._log_data[1]
227 self.verifyCommonKeys(self._log_data[0], expected_event_name="version") 225 self.verifyCommonKeys(self._log_data[0], expected_event_name="version")
228 self.verifyCommonKeys(command_event, expected_event_name="command") 226 self.verifyCommonKeys(command_event, expected_event_name="cmd_name")
229 # Check for 'command' event specific fields. 227 # Check for 'command' event specific fields.
230 self.assertIn("name", command_event) 228 self.assertIn("name", command_event)
231 self.assertIn("subcommands", command_event) 229 self.assertEqual(command_event["name"], "repo-init-this")
232 self.assertEqual(command_event["name"], name)
233 self.assertEqual(command_event["subcommands"], subcommands)
234 230
235 def test_def_params_event_repo_config(self): 231 def test_def_params_event_repo_config(self):
236 """Test 'def_params' event data outputs only repo config keys. 232 """Test 'def_params' event data outputs only repo config keys.
@@ -382,17 +378,17 @@ class EventLogTestCase(unittest.TestCase):
382 socket_path = os.path.join(tempdir, "server.sock") 378 socket_path = os.path.join(tempdir, "server.sock")
383 server_ready = threading.Condition() 379 server_ready = threading.Condition()
384 # Start "server" listening on Unix domain socket at socket_path. 380 # Start "server" listening on Unix domain socket at socket_path.
381 server_thread = threading.Thread(
382 target=serverLoggingThread,
383 args=(socket_path, server_ready, received_traces),
384 )
385 try: 385 try:
386 server_thread = threading.Thread(
387 target=serverLoggingThread,
388 args=(socket_path, server_ready, received_traces),
389 )
390 server_thread.start() 386 server_thread.start()
391 387
392 with server_ready: 388 with server_ready:
393 server_ready.wait(timeout=120) 389 server_ready.wait(timeout=120)
394 390
395 self._event_log_module.StartEvent() 391 self._event_log_module.StartEvent([])
396 path = self._event_log_module.Write( 392 path = self._event_log_module.Write(
397 path=f"af_unix:{socket_path}" 393 path=f"af_unix:{socket_path}"
398 ) 394 )