summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Kasprzak <iankaz@google.com>2021-01-19 09:04:28 -0800
committerIan Kasprzak <iankaz@google.com>2021-01-19 20:35:56 +0000
commitfebe73ff16584578e3818bc35b5a3350ab672f77 (patch)
treeb45ce1f3a0fe2a6e3967ae592d6bffc60781da4f
parente5670c881225ed025c77e0362a7c7edcc912ef9f (diff)
downloadgit-repo-febe73ff16584578e3818bc35b5a3350ab672f77.tar.gz
Update "evt" field to be logged as a string type.
Testing: - Unit tests - Verified git trace log has "evt": "2" (vs "evt": 2 previously) Bug: https://crbug.com/gerrit/13966 Change-Id: I2e0c98dda0cccdd5cb6328105c11b93cd42676eb Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/294123 Reviewed-by: Jonathan Nieder <jrn@google.com> Tested-by: Ian Kasprzak <iankaz@google.com>
-rw-r--r--git_trace2_event_log.py2
-rw-r--r--tests/test_git_trace2_event_log.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/git_trace2_event_log.py b/git_trace2_event_log.py
index dfbded15..fe34092a 100644
--- a/git_trace2_event_log.py
+++ b/git_trace2_event_log.py
@@ -92,7 +92,7 @@ class EventLog(object):
92 def _AddVersionEvent(self): 92 def _AddVersionEvent(self):
93 """Adds a 'version' event at the beginning of current log.""" 93 """Adds a 'version' event at the beginning of current log."""
94 version_event = self._CreateEventDict('version') 94 version_event = self._CreateEventDict('version')
95 version_event['evt'] = 2 95 version_event['evt'] = "2"
96 version_event['exe'] = RepoSourceVersion() 96 version_event['exe'] = RepoSourceVersion()
97 self._log.insert(0, version_event) 97 self._log.insert(0, version_event)
98 98
diff --git a/tests/test_git_trace2_event_log.py b/tests/test_git_trace2_event_log.py
index 686802ea..8fb38dbe 100644
--- a/tests/test_git_trace2_event_log.py
+++ b/tests/test_git_trace2_event_log.py
@@ -95,6 +95,8 @@ class EventLogTestCase(unittest.TestCase):
95 # Check for 'version' event specific fields. 95 # Check for 'version' event specific fields.
96 self.assertIn('evt', version_event) 96 self.assertIn('evt', version_event)
97 self.assertIn('exe', version_event) 97 self.assertIn('exe', version_event)
98 # Verify "evt" version field is a string.
99 self.assertIsInstance(version_event['evt'], str)
98 100
99 def test_start_event(self): 101 def test_start_event(self):
100 """Test and validate 'start' event data is valid. 102 """Test and validate 'start' event data is valid.