trace_processor: add support for python synthesised e2e tests
This CL introduces support for traces to be synthesised using Python
scripts and adding these to the suite of trace processor tests. This
uses proto descriptors to avoid generated python classes for all
the protos.
Specifically, this CL does the following:
* moves proto_library to recursively include all dependencies in
descriptors
* adds support to the diff test script to invoke python scripts
* adds an example synthesised trace and generic code to add other such
traces
* adds tests against this synthesised trace and associated out
files
Bug: 117596113
Change-Id: I737dd6487745645b35e3ace12342ec1f63ea7d58
diff --git a/tools/diff_test_trace_processor.py b/tools/diff_test_trace_processor.py
index 4f28e0d..82222bd 100755
--- a/tools/diff_test_trace_processor.py
+++ b/tools/diff_test_trace_processor.py
@@ -16,17 +16,24 @@
import argparse
import difflib
import glob
+import importlib
import os
import subprocess
import sys
+import tempfile
ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
TEST_DATA_DIR = os.path.join(ROOT_DIR, "test", "trace_processor")
+def trace_processor_command(trace_processor_path, trace_path, query_path):
+ return [trace_processor_path, '-q', query_path, trace_path]
+
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--index', type=str, help='location of index file',
default=os.path.join(TEST_DATA_DIR, "index"))
+ parser.add_argument('--trace-descriptor', type=str,
+ help='$(dirname trace_processor)/gen/protos/trace/trace.descriptor')
parser.add_argument('trace_processor', type=str,
help='location of trace processor binary')
args = parser.parse_args()
@@ -34,6 +41,13 @@
with open(args.index, 'r') as file:
index_lines = file.readlines()
+ if args.trace_descriptor:
+ trace_descriptor_path = args.trace_descriptor
+ else:
+ out_path = os.path.dirname(args.trace_processor)
+ trace_protos_path = os.path.join(out_path, "gen", "protos", "trace")
+ trace_descriptor_path = os.path.join(trace_protos_path, "trace.descriptor")
+
test_failure = 0
index_dir = os.path.dirname(args.index)
for line in index_lines:
@@ -52,14 +66,25 @@
print("Expected file not found {}".format(expected_path))
return 1
- cmd = [
- args.trace_processor,
- '-q',
- query_path,
- trace_path
- ]
+ if trace_path.endswith(".py"):
+ with tempfile.NamedTemporaryFile() as out:
+ python_cmd = [
+ "python",
+ trace_path,
+ trace_descriptor_path
+ ]
+ subprocess.check_call(
+ python_cmd,
+ stdout=out
+ )
+ cmd = trace_processor_command(
+ args.trace_processor, out.name, query_path)
+ actual_raw = subprocess.check_output(cmd)
+ else:
+ cmd = trace_processor_command(
+ args.trace_processor, trace_path, query_path)
+ actual_raw = subprocess.check_output(cmd)
- actual_raw = subprocess.check_output(cmd)
actual = actual_raw.decode("utf-8")
actual_lines = actual_raw.splitlines(True)
