From 2adf355dcefad81cb194d027e833ac6d31b8626a Mon Sep 17 00:00:00 2001 From: Kang Minchul Date: Fri, 24 Sep 2021 17:46:06 +0900 Subject: [PATCH] python: Sort import order of libraries using isort I think it's better to stanzdarize import orders of libraries in python scripts (in tests/ and scripts/, etc) to prevent circular imports (although happens rarely), or for faster import, or for better readabilities. We can reformat import orders with isort tools, and this commit contains the result of the tool. Also, I added pyproject.toml for unified outcome. If we run isort . unnified outcome will be made. reference: https://pypi.org/project/isort/ Signed-off-by: Kang Minchul --- misc/gen-autoargs.py | 3 ++- pyproject.toml | 8 ++++++++ tests/runtest.py | 10 ++++++---- tests/t022_filter_kernel.py | 3 ++- tests/t067_report_diff.py | 3 ++- tests/t079_replay_kernel_D.py | 5 +++-- tests/t080_replay_kernel_D2.py | 5 +++-- tests/t081_kernel_depth.py | 3 ++- tests/t091_replay_tid.py | 3 ++- tests/t092_report_tid.py | 3 ++- tests/t095_graph_tid.py | 3 ++- tests/t097_dump_basic.py | 3 ++- tests/t098_dump_tid.py | 5 +++-- tests/t099_dump_filter.py | 3 ++- tests/t100_dump_depth.py | 3 ++- tests/t103_dump_kernel.py | 5 +++-- tests/t104_graph_kernel.py | 5 +++-- tests/t111_kernel_tid.py | 5 +++-- tests/t117_time_range.py | 3 ++- tests/t122_time_range2.py | 3 ++- tests/t125_report_range.py | 3 ++- tests/t129_session_tid.py | 3 ++- tests/t132_trigger_kernel.py | 3 ++- tests/t135_trigger_time2.py | 3 ++- tests/t137_kernel_tid_update.py | 3 ++- tests/t138_kernel_dynamic.py | 3 ++- tests/t139_kernel_dynamic2.py | 3 ++- tests/t141_recv_basic.py | 5 +++-- tests/t142_recv_multi.py | 5 +++-- tests/t143_recv_kernel.py | 7 ++++--- tests/t148_event_kernel.py | 3 ++- tests/t149_event_kernel2.py | 3 ++- tests/t150_recv_event.py | 5 +++-- tests/t151_recv_runcmd.py | 3 ++- tests/t157_script_python.py | 3 ++- tests/t158_report_diff_policy1.py | 3 ++- tests/t159_report_diff_policy2.py | 3 ++- tests/t160_report_diff_policy3.py | 3 ++- tests/t164_report_sched.py | 3 ++- tests/t165_graph_sched.py | 3 ++- tests/t166_dump_sched.py | 3 ++- tests/t167_recv_sched.py | 5 +++-- tests/t169_script_args.py | 3 ++- tests/t170_script_filter.py | 3 ++- tests/t171_script_option.py | 3 ++- tests/t174_replay_filter_kernel.py | 5 +++-- tests/t177_report_diff_policy4.py | 3 ++- tests/t179_arg_auto2.py | 3 ++- tests/t180_arg_auto3.py | 3 ++- tests/t183_info_quote.py | 3 ++- tests/t184_arg_enum.py | 3 ++- tests/t189_replay_field2.py | 3 ++- tests/t196_chrome_taskname.py | 3 ++- tests/t199_script_info.py | 3 ++- tests/t200_lib_dlopen2.py | 3 ++- tests/t205_arg_auto4.py | 3 ++- tests/t206_arg_enum2.py | 3 ++- tests/t207_dump_graphviz.py | 3 ++- tests/t208_watch_cpu.py | 3 ++- tests/t219_no_libcall_script.py | 3 ++- tests/t220_trace_script.py | 4 +++- tests/t222_external_data.py | 5 +++-- tests/t230_graph_task.py | 3 ++- tests/t234_script_luajit.py | 3 ++- tests/t239_report_diff_field1.py | 3 ++- tests/t240_report_diff_field2.py | 3 ++- tests/t241_report_diff_field3.py | 3 ++- tests/t242_report_diff_field4.py | 3 ++- tests/t243_report_diff_field5.py | 3 ++- tests/t259_arg_struct_script.py | 3 ++- tests/t260_arg_struct_luajit.py | 3 ++- tests/t261_info_note.py | 3 ++- tests/t262_replay_with_syms.py | 3 ++- uftrace-gdb.py | 4 ++-- 74 files changed, 173 insertions(+), 91 deletions(-) create mode 100644 pyproject.toml diff --git a/misc/gen-autoargs.py b/misc/gen-autoargs.py index 59abb9cbb..b74e09196 100755 --- a/misc/gen-autoargs.py +++ b/misc/gen-autoargs.py @@ -9,8 +9,9 @@ # from __future__ import print_function -import sys + import re +import sys # The syntax of C in Backus-Naur Form # https://cs.wmich.edu/~gupta/teaching/cs4850/sumII06/The%20syntax%20of%20C%20in%20Backus-Naur%20form.htm diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..d7ce1962f --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,8 @@ +[tool.isort] +profile = "black" +lines_between_types = 0 +lines_after_imports = 1 +combine_as_imports = true +ignore_whitespace = true +skip_gitignore = true + diff --git a/tests/runtest.py b/tests/runtest.py index 9d612a8f4..eb91642dc 100755 --- a/tests/runtest.py +++ b/tests/runtest.py @@ -1,11 +1,13 @@ #!/usr/bin/env python +import glob +import multiprocessing +import os import random -import os, sys -import tempfile -import glob, re +import re import subprocess as sp -import multiprocessing +import sys +import tempfile import time class TestBase: diff --git a/tests/t022_filter_kernel.py b/tests/t022_filter_kernel.py index 5b5389f00..fd850d4b0 100644 --- a/tests/t022_filter_kernel.py +++ b/tests/t022_filter_kernel.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'getids', serial=True, result=""" diff --git a/tests/t067_report_diff.py b/tests/t067_report_diff.py index 54d0e0bc3..4974baa8c 100644 --- a/tests/t067_report_diff.py +++ b/tests/t067_report_diff.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t079_replay_kernel_D.py b/tests/t079_replay_kernel_D.py index 1c32441aa..9f6c6ddb3 100644 --- a/tests/t079_replay_kernel_D.py +++ b/tests/t079_replay_kernel_D.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os +import subprocess as sp + +from runtest import TestBase class TestCase(TestBase): def __init__(self): diff --git a/tests/t080_replay_kernel_D2.py b/tests/t080_replay_kernel_D2.py index 950b4335d..f4f401fed 100644 --- a/tests/t080_replay_kernel_D2.py +++ b/tests/t080_replay_kernel_D2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os +import subprocess as sp + +from runtest import TestBase TDIR='xxx' diff --git a/tests/t081_kernel_depth.py b/tests/t081_kernel_depth.py index 16227a9fa..ffd806eeb 100644 --- a/tests/t081_kernel_depth.py +++ b/tests/t081_kernel_depth.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'openclose', serial=True, result=""" diff --git a/tests/t091_replay_tid.py b/tests/t091_replay_tid.py index d96d75f06..3bc3d7478 100644 --- a/tests/t091_replay_tid.py +++ b/tests/t091_replay_tid.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os.path +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'fork', """ diff --git a/tests/t092_report_tid.py b/tests/t092_report_tid.py index 1a38f6ed1..8ea00f982 100644 --- a/tests/t092_report_tid.py +++ b/tests/t092_report_tid.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os.path +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'fork', """ diff --git a/tests/t095_graph_tid.py b/tests/t095_graph_tid.py index f013282ec..b268ede1a 100644 --- a/tests/t095_graph_tid.py +++ b/tests/t095_graph_tid.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os.path +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'fork', result=""" diff --git a/tests/t097_dump_basic.py b/tests/t097_dump_basic.py index 14d04dd6f..dcbc89a6a 100644 --- a/tests/t097_dump_basic.py +++ b/tests/t097_dump_basic.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'abc', """ diff --git a/tests/t098_dump_tid.py b/tests/t098_dump_tid.py index e36d8fad6..5b9af7885 100644 --- a/tests/t098_dump_tid.py +++ b/tests/t098_dump_tid.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os.path +import subprocess as sp + +from runtest import TestBase class TestCase(TestBase): def __init__(self): diff --git a/tests/t099_dump_filter.py b/tests/t099_dump_filter.py index 7b3bfb4b9..d01822185 100644 --- a/tests/t099_dump_filter.py +++ b/tests/t099_dump_filter.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'abc', """ diff --git a/tests/t100_dump_depth.py b/tests/t100_dump_depth.py index 62d3e1173..b77dfa996 100644 --- a/tests/t100_dump_depth.py +++ b/tests/t100_dump_depth.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'abc', """ diff --git a/tests/t103_dump_kernel.py b/tests/t103_dump_kernel.py index 48bbe13b4..2148969ca 100644 --- a/tests/t103_dump_kernel.py +++ b/tests/t103_dump_kernel.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os +import subprocess as sp + +from runtest import TestBase class TestCase(TestBase): def __init__(self): diff --git a/tests/t104_graph_kernel.py b/tests/t104_graph_kernel.py index 29b9a287a..ae3427e22 100644 --- a/tests/t104_graph_kernel.py +++ b/tests/t104_graph_kernel.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os +import subprocess as sp + +from runtest import TestBase class TestCase(TestBase): def __init__(self): diff --git a/tests/t111_kernel_tid.py b/tests/t111_kernel_tid.py index 6f1348c4d..7aafa0eb9 100644 --- a/tests/t111_kernel_tid.py +++ b/tests/t111_kernel_tid.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os +import subprocess as sp + +from runtest import TestBase class TestCase(TestBase): def __init__(self): diff --git a/tests/t117_time_range.py b/tests/t117_time_range.py index 049e50b05..efc5724f6 100644 --- a/tests/t117_time_range.py +++ b/tests/t117_time_range.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + START=0 class TestCase(TestBase): diff --git a/tests/t122_time_range2.py b/tests/t122_time_range2.py index 38d4d9962..2ac2d55cc 100644 --- a/tests/t122_time_range2.py +++ b/tests/t122_time_range2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + START=0 class TestCase(TestBase): diff --git a/tests/t125_report_range.py b/tests/t125_report_range.py index efb1c838b..b20975427 100644 --- a/tests/t125_report_range.py +++ b/tests/t125_report_range.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + START=0 class TestCase(TestBase): diff --git a/tests/t129_session_tid.py b/tests/t129_session_tid.py index 6bf2c28f8..15e1ea8e6 100644 --- a/tests/t129_session_tid.py +++ b/tests/t129_session_tid.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + # Test that task.txt files with a tid in the SESS line still work class TestCase(TestBase): diff --git a/tests/t132_trigger_kernel.py b/tests/t132_trigger_kernel.py index 8f8123d89..12587feb7 100644 --- a/tests/t132_trigger_kernel.py +++ b/tests/t132_trigger_kernel.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + # there was a problem applying depth filter if it contains kernel functions class TestCase(TestBase): def __init__(self): diff --git a/tests/t135_trigger_time2.py b/tests/t135_trigger_time2.py index 8c6dde989..dd0a1ca22 100644 --- a/tests/t135_trigger_time2.py +++ b/tests/t135_trigger_time2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + TDIR='xxx' TIME=0 UNIT='' diff --git a/tests/t137_kernel_tid_update.py b/tests/t137_kernel_tid_update.py index 02bd3889e..6c9f3d2ea 100644 --- a/tests/t137_kernel_tid_update.py +++ b/tests/t137_kernel_tid_update.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'fork2', serial=True, result=""" diff --git a/tests/t138_kernel_dynamic.py b/tests/t138_kernel_dynamic.py index 92e145e85..5b2f771ed 100644 --- a/tests/t138_kernel_dynamic.py +++ b/tests/t138_kernel_dynamic.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'openclose', serial=True, result=""" diff --git a/tests/t139_kernel_dynamic2.py b/tests/t139_kernel_dynamic2.py index 4fa42437c..3b6a62ef6 100644 --- a/tests/t139_kernel_dynamic2.py +++ b/tests/t139_kernel_dynamic2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'openclose', serial=True, result=""" diff --git a/tests/t141_recv_basic.py b/tests/t141_recv_basic.py index 0c52c4d56..e797bd77b 100644 --- a/tests/t141_recv_basic.py +++ b/tests/t141_recv_basic.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os.path +import subprocess as sp + +from runtest import TestBase TDIR = 'xxx' diff --git a/tests/t142_recv_multi.py b/tests/t142_recv_multi.py index dba0c2e06..0ea1cfd96 100644 --- a/tests/t142_recv_multi.py +++ b/tests/t142_recv_multi.py @@ -1,9 +1,10 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os.path import random +import subprocess as sp + +from runtest import TestBase TDIR = 'xxx' diff --git a/tests/t143_recv_kernel.py b/tests/t143_recv_kernel.py index f3989304d..61fa7beb7 100644 --- a/tests/t143_recv_kernel.py +++ b/tests/t143_recv_kernel.py @@ -1,9 +1,10 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp -import random import os +import random +import subprocess as sp + +from runtest import TestBase TDIR = 'xxx' diff --git a/tests/t148_event_kernel.py b/tests/t148_event_kernel.py index a29f070b4..1677adcb2 100644 --- a/tests/t148_event_kernel.py +++ b/tests/t148_event_kernel.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'sleep', serial=True, result=""" diff --git a/tests/t149_event_kernel2.py b/tests/t149_event_kernel2.py index 9da9aab48..38d344629 100644 --- a/tests/t149_event_kernel2.py +++ b/tests/t149_event_kernel2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'fork', serial=True, result=""" diff --git a/tests/t150_recv_event.py b/tests/t150_recv_event.py index 3e26552f3..96285f6f9 100644 --- a/tests/t150_recv_event.py +++ b/tests/t150_recv_event.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os.path +import subprocess as sp + +from runtest import TestBase TDIR = 'xxx' diff --git a/tests/t151_recv_runcmd.py b/tests/t151_recv_runcmd.py index e73f518b4..4674e54d3 100644 --- a/tests/t151_recv_runcmd.py +++ b/tests/t151_recv_runcmd.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + TDIR = 'xxx' TMPF = 'out' diff --git a/tests/t157_script_python.py b/tests/t157_script_python.py index a52074d6d..a82544134 100644 --- a/tests/t157_script_python.py +++ b/tests/t157_script_python.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'abc', '5') diff --git a/tests/t158_report_diff_policy1.py b/tests/t158_report_diff_policy1.py index 98248b5d1..9b3745c7b 100644 --- a/tests/t158_report_diff_policy1.py +++ b/tests/t158_report_diff_policy1.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t159_report_diff_policy2.py b/tests/t159_report_diff_policy2.py index 52fe53855..e60b50e37 100644 --- a/tests/t159_report_diff_policy2.py +++ b/tests/t159_report_diff_policy2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t160_report_diff_policy3.py b/tests/t160_report_diff_policy3.py index 8e03131c6..dfdf82eaa 100644 --- a/tests/t160_report_diff_policy3.py +++ b/tests/t160_report_diff_policy3.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t164_report_sched.py b/tests/t164_report_sched.py index 909d25422..da48e1d41 100644 --- a/tests/t164_report_sched.py +++ b/tests/t164_report_sched.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'sort', serial=True, result=""" diff --git a/tests/t165_graph_sched.py b/tests/t165_graph_sched.py index ae92d54ff..55949b024 100644 --- a/tests/t165_graph_sched.py +++ b/tests/t165_graph_sched.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + FUNC='main' class TestCase(TestBase): diff --git a/tests/t166_dump_sched.py b/tests/t166_dump_sched.py index 71eeb837d..584f6024d 100644 --- a/tests/t166_dump_sched.py +++ b/tests/t166_dump_sched.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'sleep', serial=True, result=""" diff --git a/tests/t167_recv_sched.py b/tests/t167_recv_sched.py index 8dcbad88b..adaf34a18 100644 --- a/tests/t167_recv_sched.py +++ b/tests/t167_recv_sched.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os.path +import subprocess as sp + +from runtest import TestBase TDIR = 'xxx' diff --git a/tests/t169_script_args.py b/tests/t169_script_args.py index 86744255c..224b319be 100644 --- a/tests/t169_script_args.py +++ b/tests/t169_script_args.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + FILE='script.py' script = """ diff --git a/tests/t170_script_filter.py b/tests/t170_script_filter.py index bb2ba53a5..ad9c5ca34 100644 --- a/tests/t170_script_filter.py +++ b/tests/t170_script_filter.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + FILE='script.py' script = """ diff --git a/tests/t171_script_option.py b/tests/t171_script_option.py index e7feee985..8cf91ffb2 100644 --- a/tests/t171_script_option.py +++ b/tests/t171_script_option.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + FILE='script.py' script = """ diff --git a/tests/t174_replay_filter_kernel.py b/tests/t174_replay_filter_kernel.py index fdd9ee599..5c09d3aa4 100644 --- a/tests/t174_replay_filter_kernel.py +++ b/tests/t174_replay_filter_kernel.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os +import subprocess as sp + +from runtest import TestBase class TestCase(TestBase): def __init__(self): diff --git a/tests/t177_report_diff_policy4.py b/tests/t177_report_diff_policy4.py index 25a4e2906..c62b443ba 100644 --- a/tests/t177_report_diff_policy4.py +++ b/tests/t177_report_diff_policy4.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t179_arg_auto2.py b/tests/t179_arg_auto2.py index 69629c527..e11b6cef5 100644 --- a/tests/t179_arg_auto2.py +++ b/tests/t179_arg_auto2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import re +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'autoargs', result="""hello diff --git a/tests/t180_arg_auto3.py b/tests/t180_arg_auto3.py index 30ccfb995..188bfd97c 100644 --- a/tests/t180_arg_auto3.py +++ b/tests/t180_arg_auto3.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import re +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'autoargs', result="""hello diff --git a/tests/t183_info_quote.py b/tests/t183_info_quote.py index dc9c6355b..6de248b15 100644 --- a/tests/t183_info_quote.py +++ b/tests/t183_info_quote.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'hello', """ diff --git a/tests/t184_arg_enum.py b/tests/t184_arg_enum.py index a49de4137..72f331986 100644 --- a/tests/t184_arg_enum.py +++ b/tests/t184_arg_enum.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import re +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'mmap', result=""" diff --git a/tests/t189_replay_field2.py b/tests/t189_replay_field2.py index 3993c7930..d3194ed52 100644 --- a/tests/t189_replay_field2.py +++ b/tests/t189_replay_field2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'taskname', ldflags='-pthread', serial=True, result=""" diff --git a/tests/t196_chrome_taskname.py b/tests/t196_chrome_taskname.py index bb55d8eb9..0f37acd4d 100644 --- a/tests/t196_chrome_taskname.py +++ b/tests/t196_chrome_taskname.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'taskname', ldflags='-pthread', serial=True, result=""" diff --git a/tests/t199_script_info.py b/tests/t199_script_info.py index 8e162fc8f..cabd7f3fc 100644 --- a/tests/t199_script_info.py +++ b/tests/t199_script_info.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'abc', """ diff --git a/tests/t200_lib_dlopen2.py b/tests/t200_lib_dlopen2.py index 0158d7234..f95748a96 100644 --- a/tests/t200_lib_dlopen2.py +++ b/tests/t200_lib_dlopen2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os +from runtest import TestBase + class TestCase(TestBase): """This tests when dlopen() loads multiple libraries (libbar and libbaz) at once. The Parent code is in libbar while Child is in libbaz.""" diff --git a/tests/t205_arg_auto4.py b/tests/t205_arg_auto4.py index 830e7be2a..df6b3d5be 100644 --- a/tests/t205_arg_auto4.py +++ b/tests/t205_arg_auto4.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import re +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'autoargs', result="""autoargs test diff --git a/tests/t206_arg_enum2.py b/tests/t206_arg_enum2.py index 8708b1898..2f878a2d7 100644 --- a/tests/t206_arg_enum2.py +++ b/tests/t206_arg_enum2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import re +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'enum', result=""" diff --git a/tests/t207_dump_graphviz.py b/tests/t207_dump_graphviz.py index bb76ae8de..8ba796280 100644 --- a/tests/t207_dump_graphviz.py +++ b/tests/t207_dump_graphviz.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import os.path +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'abc', """digraph "%s" { diff --git a/tests/t208_watch_cpu.py b/tests/t208_watch_cpu.py index 0cba79a0e..52369f356 100644 --- a/tests/t208_watch_cpu.py +++ b/tests/t208_watch_cpu.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import re +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'chcpu', serial=True, result=""" diff --git a/tests/t219_no_libcall_script.py b/tests/t219_no_libcall_script.py index 82191288c..db050482b 100644 --- a/tests/t219_no_libcall_script.py +++ b/tests/t219_no_libcall_script.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'signal', """ diff --git a/tests/t220_trace_script.py b/tests/t220_trace_script.py index 88d7f4d7a..73acf6759 100644 --- a/tests/t220_trace_script.py +++ b/tests/t220_trace_script.py @@ -1,6 +1,8 @@ #!/usr/bin/env python -import os, stat +import os +import stat + from runtest import TestBase TEST_SCRIPT = "./test-script.sh" diff --git a/tests/t222_external_data.py b/tests/t222_external_data.py index 0c293a86c..48db8ce38 100644 --- a/tests/t222_external_data.py +++ b/tests/t222_external_data.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase -import subprocess as sp import os.path +import subprocess as sp + +from runtest import TestBase class TestCase(TestBase): def __init__(self): diff --git a/tests/t230_graph_task.py b/tests/t230_graph_task.py index 9d3e869fa..78d55104a 100644 --- a/tests/t230_graph_task.py +++ b/tests/t230_graph_task.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import re +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'fork', result=""" diff --git a/tests/t234_script_luajit.py b/tests/t234_script_luajit.py index bf4c9ab92..5c8d1c677 100644 --- a/tests/t234_script_luajit.py +++ b/tests/t234_script_luajit.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'abc', '5') diff --git a/tests/t239_report_diff_field1.py b/tests/t239_report_diff_field1.py index db1e11282..d1d272456 100644 --- a/tests/t239_report_diff_field1.py +++ b/tests/t239_report_diff_field1.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t240_report_diff_field2.py b/tests/t240_report_diff_field2.py index c313bfa5d..eb164cc0b 100644 --- a/tests/t240_report_diff_field2.py +++ b/tests/t240_report_diff_field2.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t241_report_diff_field3.py b/tests/t241_report_diff_field3.py index 120edc9e9..e28b552ea 100644 --- a/tests/t241_report_diff_field3.py +++ b/tests/t241_report_diff_field3.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t242_report_diff_field4.py b/tests/t242_report_diff_field4.py index 2f52010f1..04d60c510 100644 --- a/tests/t242_report_diff_field4.py +++ b/tests/t242_report_diff_field4.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t243_report_diff_field5.py b/tests/t243_report_diff_field5.py index 57e7b257a..bd5c5ce2f 100644 --- a/tests/t243_report_diff_field5.py +++ b/tests/t243_report_diff_field5.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + XDIR='xxx' YDIR='yyy' diff --git a/tests/t259_arg_struct_script.py b/tests/t259_arg_struct_script.py index f412fb3fa..9096630bf 100644 --- a/tests/t259_arg_struct_script.py +++ b/tests/t259_arg_struct_script.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'struct', """ diff --git a/tests/t260_arg_struct_luajit.py b/tests/t260_arg_struct_luajit.py index c4b1ffba7..ca49a69db 100644 --- a/tests/t260_arg_struct_luajit.py +++ b/tests/t260_arg_struct_luajit.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'struct', """ diff --git a/tests/t261_info_note.py b/tests/t261_info_note.py index acd775054..3d83420fd 100644 --- a/tests/t261_info_note.py +++ b/tests/t261_info_note.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + class TestCase(TestBase): def __init__(self): TestBase.__init__(self, 'hello', """ diff --git a/tests/t262_replay_with_syms.py b/tests/t262_replay_with_syms.py index 61bdd5339..85ce20880 100644 --- a/tests/t262_replay_with_syms.py +++ b/tests/t262_replay_with_syms.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from runtest import TestBase import subprocess as sp +from runtest import TestBase + SYMDIR = "abc.syms" class TestCase(TestBase): diff --git a/uftrace-gdb.py b/uftrace-gdb.py index cc235d1d9..a00c26e11 100644 --- a/uftrace-gdb.py +++ b/uftrace-gdb.py @@ -22,9 +22,9 @@ except: gdb.write("NOTE: gdb 7.2 or later required for helper scripts to work.\n") else: - import uftrace.utils import uftrace.lists - import uftrace.plthook import uftrace.mcount + import uftrace.plthook import uftrace.rbtree import uftrace.trigger + import uftrace.utils