diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /test/suite_capture.py | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | test/suite_capture.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/suite_capture.py b/test/suite_capture.py index ffcd6cd5..48c2794d 100644 --- a/test/suite_capture.py +++ b/test/suite_capture.py @@ -72,12 +72,13 @@ def wireshark_k(wireshark_command): return tuple(list(wireshark_command) + ['-k']) -def capture_command(*args, shell=False): +def capture_command(*args, shell=False, quoted=False): cmd_args = list(args) if type(cmd_args[0]) != str: # Assume something like ['wireshark', '-k'] cmd_args = list(cmd_args[0]) + list(cmd_args)[1:] if shell: + cmd_args[0] = f'"{cmd_args[0]}"' cmd_args = ' '.join(cmd_args) return cmd_args @@ -156,7 +157,7 @@ def check_capture_stdin(cmd_capinfos, result_file): slow_dhcp_cmd = cat_dhcp_command('slow') capture_cmd = capture_command(cmd, '-i', '-', - '-w', testout_file, + '-w', f'"{testout_file}"', '-a', 'duration:{}'.format(capture_duration), shell=True ) |