Merge "perfetto: migrate PRESUBMIT.py to Python 3"
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 5307e5a..09fa05c 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -18,6 +18,9 @@
import time
+USE_PYTHON3 = True
+
+
def RunAndReportIfLong(func, *args, **kargs):
start = time.time()
results = func(*args, **kargs)
diff --git a/test/trace_processor/PRESUBMIT.py b/test/trace_processor/PRESUBMIT.py
index a882d75..23d5d64 100644
--- a/test/trace_processor/PRESUBMIT.py
+++ b/test/trace_processor/PRESUBMIT.py
@@ -18,6 +18,9 @@
from os.path import relpath
+USE_PYTHON3 = True
+
+
def RunAndReportIfLong(func, *args, **kargs):
start = time.time()
results = func(*args, **kargs)
diff --git a/test/trace_processor/memory/index b/test/trace_processor/memory/index
index e9e263d..5de39bf 100644
--- a/test/trace_processor/memory/index
+++ b/test/trace_processor/memory/index
@@ -20,4 +20,4 @@
android_fastrpc_dma_stat.textproto android_fastrpc android_fastrpc_dma_stat.out
# shrink slab
-shrink_slab.textproto shrink_slab.sql shrink_slab.out
\ No newline at end of file
+shrink_slab.textproto shrink_slab_test.sql shrink_slab.out
\ No newline at end of file
diff --git a/test/trace_processor/memory/shrink_slab.sql b/test/trace_processor/memory/shrink_slab_test.sql
similarity index 100%
rename from test/trace_processor/memory/shrink_slab.sql
rename to test/trace_processor/memory/shrink_slab_test.sql
diff --git a/test/trace_processor/profiling/index b/test/trace_processor/profiling/index
index 733a29c..747d56b 100644
--- a/test/trace_processor/profiling/index
+++ b/test/trace_processor/profiling/index
@@ -61,4 +61,4 @@
../../data/callstack_sampling.pftrace callstack_sampling_flamegraph_test.sql callstack_sampling_flamegraph.out
../../data/callstack_sampling.pftrace callstack_sampling_flamegraph_multi_process_test.sql callstack_sampling_flamegraph_multi_process.out
-heap_profile_data_local_tmp.textproto no_build_id.sql no_build_id.out
+heap_profile_data_local_tmp.textproto no_build_id_test.sql no_build_id.out
diff --git a/test/trace_processor/profiling/no_build_id.sql b/test/trace_processor/profiling/no_build_id_test.sql
similarity index 100%
rename from test/trace_processor/profiling/no_build_id.sql
rename to test/trace_processor/profiling/no_build_id_test.sql
diff --git a/ui/PRESUBMIT.py b/ui/PRESUBMIT.py
index fe427dc..26cf3bc 100644
--- a/ui/PRESUBMIT.py
+++ b/ui/PRESUBMIT.py
@@ -18,6 +18,9 @@
from os.path import relpath
+USE_PYTHON3 = True
+
+
def RunAndReportIfLong(func, *args, **kargs):
start = time.time()
results = func(*args, **kargs)
diff --git a/ui/config/integrationtest_env.js b/ui/config/integrationtest_env.js
index b7509ee..3a456de 100644
--- a/ui/config/integrationtest_env.js
+++ b/ui/config/integrationtest_env.js
@@ -62,4 +62,4 @@
runScript(script) {
return super.runScript(script);
}
-}
+};
diff --git a/ui/config/integrationtest_teardown.js b/ui/config/integrationtest_teardown.js
index 6d152dd..4cfbc84 100644
--- a/ui/config/integrationtest_teardown.js
+++ b/ui/config/integrationtest_teardown.js
@@ -19,6 +19,6 @@
for (;;) {
if (proc.exitCode !== null || proc.killed) break;
console.log('Waiting for dev server termination');
- await new Promise(r => setTimeout(r, 1000));
+ await new Promise((r) => setTimeout(r, 1000));
}
-}
+};
diff --git a/ui/config/jest.integrationtest.config.js b/ui/config/jest.integrationtest.config.js
index 079abaf..9f58c3d 100644
--- a/ui/config/jest.integrationtest.config.js
+++ b/ui/config/jest.integrationtest.config.js
@@ -18,4 +18,4 @@
globalSetup: __dirname + '/integrationtest_setup.js',
globalTeardown: __dirname + '/integrationtest_teardown.js',
testEnvironment: __dirname + '/integrationtest_env.js',
-}
+};
diff --git a/ui/config/jest.unittest.config.js b/ui/config/jest.unittest.config.js
index fc1bd35..e8efad3 100644
--- a/ui/config/jest.unittest.config.js
+++ b/ui/config/jest.unittest.config.js
@@ -15,5 +15,5 @@
module.exports = {
transform: {},
testRegex: '_(unittest|jsdomtest)[.]js$',
- testEnvironment: 'jsdom'
-}
+ testEnvironment: 'jsdom',
+};
diff --git a/ui/config/rollup-serviceworker.config.js b/ui/config/rollup-serviceworker.config.js
index b7aaf21..023dbdd 100644
--- a/ui/config/rollup-serviceworker.config.js
+++ b/ui/config/rollup-serviceworker.config.js
@@ -38,4 +38,4 @@
commonjs(),
sourcemaps(),
],
-}]
+}];
