test padding non micro timestamps

Author: jnewbery

test/functional/combine_logs.py

@@ -13,7 +13,7 @@
 import sys
 
 # Matches on the date format at the start of the log event
-TIMESTAMP_PATTERN = re.compile(r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}Z")
+TIMESTAMP_PATTERN = re.compile(r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?Z")
 
 LogEvent = namedtuple('LogEvent', ['timestamp', 'source', 'event'])
 
@@ -75,8 +75,13 @@ def get_log_events(source, logfile):
                 if time_match:
                     if event:
                         yield LogEvent(timestamp=timestamp, source=source, event=event.rstrip())
-                    event = line
                     timestamp = time_match.group()
+                    if time_match.group(1) is None:
+                        # timestamp does not have microseconds. Add zeroes.
+                        timestamp_micro = timestamp.replace("Z", ".000000Z")
+                        line = line.replace(timestamp, timestamp_micro)
+                        timestamp = timestamp_micro
+                    event = line
                 # if it doesn't have a timestamp, it's a continuation line of the previous log.
                 else:
                     # Add the line. Prefix with space equivalent to the source + timestamp so log lines are aligned