aboutsummaryrefslogtreecommitdiff
path: root/tests/test_base.py
diff options
context:
space:
mode:
authorJavi Merino <javi.merino@arm.com>2015-12-22 17:15:32 +0000
committerJavi Merino <javi.merino@arm.com>2015-12-22 17:15:32 +0000
commita5db2d84050d18299f20c227b5f82895584a3c79 (patch)
treef43214404ca4c2ad0493a67de6115bc56b91b59d /tests/test_base.py
parentb280b4fd175789648650f66ed5fb3b4f42fb3de2 (diff)
downloadtrappy-a5db2d84050d18299f20c227b5f82895584a3c79.tar.gz
tests: unregister dynamically created classes in the tests
The classes registered dynamically in the tests persist across the execution of the testsuite. That makes the testsuite sometimes fail if a test has added a class to the sched scope and test_ftrace_has_all_classes_scope_sched() run concurrently. Unregister the dynamic events when the tests that register them finish.
Diffstat (limited to 'tests/test_base.py')
-rw-r--r--tests/test_base.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/test_base.py b/tests/test_base.py
index 24ada6f..a0dba9d 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -122,7 +122,7 @@ class TestBase(utils_tests.SetupDirectory):
with open("trace.txt", "w") as fout:
fout.write(in_data)
- trappy.register_dynamic_ftrace("Event0", "event0", scope="sched")
+ ftrace_parser = trappy.register_dynamic_ftrace("Event0", "event0", scope="sched")
trace = trappy.FTrace()
dfr = trace.event0.data_frame
@@ -135,6 +135,8 @@ class TestBase(utils_tests.SetupDirectory):
self.assertEquals(dfr["__pid"].iloc[idx], events[timestap]['pid'])
self.assertEquals(dfr["__cpu"].iloc[idx], events[timestap]['cpu'])
+ trappy.unregister_dynamic_ftrace(ftrace_parser)
+
def test_parse_values_concatenation(self):
"""TestBase: Trace with space separated values created a valid DataFrame"""
@@ -146,7 +148,7 @@ class TestBase(utils_tests.SetupDirectory):
with open("trace.txt", "w") as fout:
fout.write(in_data)
- trappy.register_dynamic_ftrace("sched_stat_runtime",
+ ftrace_parser = trappy.register_dynamic_ftrace("sched_stat_runtime",
"my_sched_stat_runtime", scope="sched")
trace = trappy.FTrace()
dfr = trace.sched_stat_runtime.data_frame
@@ -157,6 +159,8 @@ class TestBase(utils_tests.SetupDirectory):
self.assertEquals(dfr["runtime"].iloc[0], 262875)
self.assertEquals(dfr["vruntime"].iloc[0], 17096359856)
+ trappy.unregister_dynamic_ftrace(ftrace_parser)
+
def test_get_dataframe(self):
"""TestBase: Thermal.data_frame["thermal_zone"] exists and
it contains a known value"""