From 2493eeec72d0a51f3e8291d6589719194eafc5d7 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 23 Jun 2019 12:14:04 +0200 Subject: [PATCH] Format --- tracetools_test/test/test_intra.py | 1 - tracetools_test/test/test_node.py | 1 - tracetools_test/test/test_publisher.py | 1 - tracetools_test/test/test_service.py | 1 - tracetools_test/test/test_service_callback.py | 1 - tracetools_test/test/test_subscription.py | 1 - .../test/test_subscription_callback.py | 1 - tracetools_test/test/test_timer.py | 1 - tracetools_test/tracetools_test/case.py | 2 +- tracetools_test/tracetools_test/utils.py | 27 +++++++++++++------ 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/tracetools_test/test/test_intra.py b/tracetools_test/test/test_intra.py index 9733b29..3528bcd 100644 --- a/tracetools_test/test/test_intra.py +++ b/tracetools_test/test/test_intra.py @@ -18,7 +18,6 @@ from tracetools_test.case import TraceTestCase class TestIntra(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/test/test_node.py b/tracetools_test/test/test_node.py index bd731b2..1c138a2 100644 --- a/tracetools_test/test/test_node.py +++ b/tracetools_test/test/test_node.py @@ -21,7 +21,6 @@ VERSION_REGEX = r'^[0-9]\.[0-9]\.[0-9]$' class TestNode(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/test/test_publisher.py b/tracetools_test/test/test_publisher.py index 31c4cb0..163568f 100644 --- a/tracetools_test/test/test_publisher.py +++ b/tracetools_test/test/test_publisher.py @@ -18,7 +18,6 @@ from tracetools_test.case import TraceTestCase class TestPublisher(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/test/test_service.py b/tracetools_test/test/test_service.py index 7767ea9..8a6754a 100644 --- a/tracetools_test/test/test_service.py +++ b/tracetools_test/test/test_service.py @@ -18,7 +18,6 @@ from tracetools_test.case import TraceTestCase class TestService(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/test/test_service_callback.py b/tracetools_test/test/test_service_callback.py index 4d74158..5bc6571 100644 --- a/tracetools_test/test/test_service_callback.py +++ b/tracetools_test/test/test_service_callback.py @@ -18,7 +18,6 @@ from tracetools_test.case import TraceTestCase class TestServiceCallback(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/test/test_subscription.py b/tracetools_test/test/test_subscription.py index f724591..2c13ae9 100644 --- a/tracetools_test/test/test_subscription.py +++ b/tracetools_test/test/test_subscription.py @@ -18,7 +18,6 @@ from tracetools_test.case import TraceTestCase class TestSubscription(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/test/test_subscription_callback.py b/tracetools_test/test/test_subscription_callback.py index 1f057da..3980d07 100644 --- a/tracetools_test/test/test_subscription_callback.py +++ b/tracetools_test/test/test_subscription_callback.py @@ -18,7 +18,6 @@ from tracetools_test.case import TraceTestCase class TestSubscriptionCallback(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/test/test_timer.py b/tracetools_test/test/test_timer.py index a86f4d3..cc339fc 100644 --- a/tracetools_test/test/test_timer.py +++ b/tracetools_test/test/test_timer.py @@ -18,7 +18,6 @@ from tracetools_test.case import TraceTestCase class TestTimer(TraceTestCase): - def __init__(self, *args) -> None: super().__init__( *args, diff --git a/tracetools_test/tracetools_test/case.py b/tracetools_test/tracetools_test/case.py index 100d90f..e7620da 100644 --- a/tracetools_test/tracetools_test/case.py +++ b/tracetools_test/tracetools_test/case.py @@ -48,7 +48,7 @@ class TraceTestCase(unittest.TestCase): nodes: List[str], base_path: str = '/tmp', events_kernel: List[str] = None, - package: str = 'tracetools_test' + package: str = 'tracetools_test', ) -> None: """Constructor.""" print(f'methodName={args[0]}') diff --git a/tracetools_test/tracetools_test/utils.py b/tracetools_test/tracetools_test/utils.py index 1cde40f..23e3940 100644 --- a/tracetools_test/tracetools_test/utils.py +++ b/tracetools_test/tracetools_test/utils.py @@ -36,12 +36,12 @@ from tracetools_trace.tools.lttng import ( def run_and_trace( - base_path: str, - session_name_prefix: str, - ros_events: List[str], - kernel_events: List[str], - package_name: str, - node_names: List[str] + base_path: str, + session_name_prefix: str, + ros_events: List[str], + kernel_events: List[str], + package_name: str, + node_names: List[str], ) -> Tuple[int, str]: """ Run a node while tracing. @@ -107,8 +107,19 @@ def get_trace_events(trace_directory: str) -> List[DictEvent]: # List of ignored CTF fields _IGNORED_FIELDS = [ - 'content_size', 'cpu_id', 'events_discarded', 'id', 'packet_size', 'packet_seq_num', - 'stream_id', 'stream_instance_id', 'timestamp_end', 'timestamp_begin', 'magic', 'uuid', 'v' + 'content_size', + 'cpu_id', + 'events_discarded', + 'id', + 'packet_size', + 'packet_seq_num', + 'stream_id', + 'stream_instance_id', + 'timestamp_end', + 'timestamp_begin', + 'magic', + 'uuid', + 'v', ] _DISCARD = 'events_discarded'