aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJavi Merino <merino.jav@gmail.com>2017-01-20 12:25:27 +0000
committerGitHub <noreply@github.com>2017-01-20 12:25:27 +0000
commit55d45f7b192ce517cf2a33508632d01eae8630ec (patch)
tree1ecbb93113e7456d075aa0780f9454df09379cd7 /tests
parent21860e981bede49f9da66a9c8f1421e4f7ec73a8 (diff)
parent214940f3fb53b45358168759f7198149b9dd01bf (diff)
downloadtrappy-55d45f7b192ce517cf2a33508632d01eae8630ec.tar.gz
Merge pull request #237 from bjackman/trace-field-equals-sign
base: Don't error on event field values containing '='
Diffstat (limited to 'tests')
-rw-r--r--tests/test_base.py14
-rw-r--r--tests/trace_equals.txt7
2 files changed, 20 insertions, 1 deletions
diff --git a/tests/test_base.py b/tests/test_base.py
index 9a4aaa3..c186ecc 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -74,7 +74,8 @@ class TestBase(utils_tests.SetupDirectory):
def __init__(self, *args, **kwargs):
super(TestBase, self).__init__(
- [("../doc/trace.txt", "trace.txt")],
+ [("../doc/trace.txt", "trace.txt"),
+ ("trace_equals.txt", "trace_equals.txt")],
*args,
**kwargs)
@@ -201,3 +202,14 @@ class TestBase(utils_tests.SetupDirectory):
self.assertEquals(round(thrm.data_frame.index[0], 7), 0)
self.assertEquals(round(last_time - expected_last_time, 7), 0)
+
+ def test_equals_in_field_value(self):
+ """TestBase: Can parse events with fields with values containing '='"""
+ trace = trappy.FTrace("trace_equals.txt", events=['equals_event'])
+
+ df = trace.equals_event.data_frame
+ self.assertSetEqual(set(df.columns),
+ set(["__comm", "__pid", "__cpu", "my_field"]))
+ self.assertListEqual(df["my_field"].tolist(),
+ ["foo", "foo=bar", "foo=bar=baz", 1,
+ "1=2", "1=foo", "1foo=2"])
diff --git a/tests/trace_equals.txt b/tests/trace_equals.txt
new file mode 100644
index 0000000..01e1ce1
--- /dev/null
+++ b/tests/trace_equals.txt
@@ -0,0 +1,7 @@
+ systemd-journal-1662 [003] 653.065292: bputs: 0xffff0000080feeb8s: equals_event: my_field=foo
+ systemd-journal-1662 [003] 653.065293: bputs: 0xffff0000080feeb8s: equals_event: my_field=foo=bar
+ systemd-journal-1662 [003] 653.065294: bputs: 0xffff0000080feeb8s: equals_event: my_field=foo=bar=baz
+ systemd-journal-1662 [003] 653.065295: bputs: 0xffff0000080feeb8s: equals_event: my_field=1
+ systemd-journal-1662 [003] 653.065296: bputs: 0xffff0000080feeb8s: equals_event: my_field=1=2
+ systemd-journal-1662 [003] 653.065297: bputs: 0xffff0000080feeb8s: equals_event: my_field=1=foo
+ systemd-journal-1662 [003] 653.065298: bputs: 0xffff0000080feeb8s: equals_event: my_field=1foo=2