summaryrefslogtreecommitdiffstats
path: root/test/suite_sharkd.py
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:25 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:25 +0000
commitf59ea5f7690c9a01ef6f7f6508084a66c40b1dae (patch)
tree482ee255d71f113be6c62e9ff3543fd6ebb9f12a /test/suite_sharkd.py
parentReleasing progress-linux version 4.2.2-1.1~progress7.99u1. (diff)
downloadwireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.tar.xz
wireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.zip
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/suite_sharkd.py')
-rw-r--r--test/suite_sharkd.py36
1 files changed, 34 insertions, 2 deletions
diff --git a/test/suite_sharkd.py b/test/suite_sharkd.py
index db736dc..d8c1ef2 100644
--- a/test/suite_sharkd.py
+++ b/test/suite_sharkd.py
@@ -75,7 +75,23 @@ class TestSharkd:
check_sharkd_session((
{"jsonrpc":"2.0", "id":1, "method":"status"},
), (
- {"jsonrpc":"2.0","id":1,"result":{"frames":0,"duration":0.000000000,"columns":["No.","Time","Source","Destination","Protocol","Length","Info"]}},
+ {"jsonrpc":"2.0","id":1,"result":{"frames":0,"duration":0.000000000,"columns":["No.","Time","Source","Destination","Protocol","Length","Info"],
+ "column_info":[{
+ "title":"No.","format": "%m","visible":True, "resolved":True
+ },{
+ "title": "Time", "format": "%t", "visible":True, "resolved":True
+ },{
+ "title": "Source", "format": "%s", "visible":True, "resolved":True
+ },{
+ "title": "Destination", "format": "%d", "visible":True, "resolved":True
+ },{
+ "title": "Protocol", "format": "%p", "visible":True, "resolved":True
+ },{
+ "title": "Length", "format": "%L", "visible":True, "resolved":True
+ },{
+ "title": "Info", "format": "%i", "visible":True, "resolved":True
+ }]
+ }},
))
def test_sharkd_req_status(self, check_sharkd_session, capture_file):
@@ -88,7 +104,23 @@ class TestSharkd:
{"jsonrpc":"2.0","id":1,"result":{"status":"OK"}},
{"jsonrpc":"2.0","id":2,"result":{"frames": 4, "duration": 0.070345000,
"filename": "dhcp.pcap", "filesize": 1400,
- "columns":["No.","Time","Source","Destination","Protocol","Length","Info"]}},
+ "columns":["No.","Time","Source","Destination","Protocol","Length","Info"],
+ "column_info":[{
+ "title":"No.","format": "%m","visible":True, "resolved":True
+ },{
+ "title": "Time", "format": "%t", "visible":True, "resolved":True
+ },{
+ "title": "Source", "format": "%s", "visible":True, "resolved":True
+ },{
+ "title": "Destination", "format": "%d", "visible":True, "resolved":True
+ },{
+ "title": "Protocol", "format": "%p", "visible":True, "resolved":True
+ },{
+ "title": "Length", "format": "%L", "visible":True, "resolved":True
+ },{
+ "title": "Info", "format": "%i", "visible":True, "resolved":True
+ }]
+ }},
))
def test_sharkd_req_analyse(self, check_sharkd_session, capture_file):