summaryrefslogtreecommitdiffstats
path: root/tests/test_git_trace2_event_log.py
diff options
context:
space:
mode:
authorRaman Tenneti <rtenneti@google.com>2021-09-28 17:15:14 -0700
committerRaman Tenneti <rtenneti@google.com>2021-09-29 21:24:59 +0000
commit4f88206178e37205ac13220f4d38b8132839acd9 (patch)
tree7367c813549978165a2fe919eddd47b8145b17ea /tests/test_git_trace2_event_log.py
parentf88282ccc2f20e0f0498901a796eb82a5640daf9 (diff)
downloadgit-repo-4f88206178e37205ac13220f4d38b8132839acd9.tar.gz
trace2_event: Add remove_prefix to fix failing tests on Linux & macOS.
removeprefix is available i python 3.9. Mac and Linux are running in a version below 3.9. Thus tests are failing with the following error: "AttributeError: 'str' object has no attribute 'removeprefix' " Replaced the removeprefix with custom function which we will delete once Linux and macOS versions are updated. Tested: $ ./run_tests Bug: [google internal] b/201453085 Change-Id: I9b4d564ff1176e1b4471805ef05472c1914cd9f9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319375 Tested-by: Raman Tenneti <rtenneti@google.com> Reviewed-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'tests/test_git_trace2_event_log.py')
-rw-r--r--tests/test_git_trace2_event_log.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/test_git_trace2_event_log.py b/tests/test_git_trace2_event_log.py
index 7bd21e21..89dcfb92 100644
--- a/tests/test_git_trace2_event_log.py
+++ b/tests/test_git_trace2_event_log.py
@@ -66,6 +66,13 @@ class EventLogTestCase(unittest.TestCase):
66 log_data.append(json.loads(line)) 66 log_data.append(json.loads(line))
67 return log_data 67 return log_data
68 68
69 def remove_prefix(self, s, prefix):
70 """Return a copy string after removing |prefix| from |s|, if present or the original string."""
71 if s.startswith(prefix):
72 return s[len(prefix):]
73 else:
74 return s
75
69 def test_initial_state_with_parent_sid(self): 76 def test_initial_state_with_parent_sid(self):
70 """Test initial state when 'GIT_TRACE2_PARENT_SID' is set by parent.""" 77 """Test initial state when 'GIT_TRACE2_PARENT_SID' is set by parent."""
71 self.assertRegex(self._event_log_module.full_sid, self.FULL_SID_REGEX) 78 self.assertRegex(self._event_log_module.full_sid, self.FULL_SID_REGEX)
@@ -265,7 +272,8 @@ class EventLogTestCase(unittest.TestCase):
265 # Check for 'data' event specific fields. 272 # Check for 'data' event specific fields.
266 self.assertIn('key', event) 273 self.assertIn('key', event)
267 self.assertIn('value', event) 274 self.assertIn('value', event)
268 key = event['key'].removeprefix(f'{prefix_value}/') 275 key = event['key']
276 key = self.remove_prefix(key, f'{prefix_value}/')
269 value = event['value'] 277 value = event['value']
270 self.assertEqual(self._event_log_module.GetDataEventName(value), event['event']) 278 self.assertEqual(self._event_log_module.GetDataEventName(value), event['event'])
271 self.assertTrue(key in config and value == config[key]) 279 self.assertTrue(key in config and value == config[key])