diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-11-30 01:31:32 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-30 06:11:06 +0000 |
| commit | ee61bc739e133ca2b07bc51d1baa3249265193dd (patch) | |
| tree | 21b40ad794b1217b35d11750ec2058c7acff0067 /test/suite_clopts.py | |
| parent | 9c0beafe44480b352bb4af56754143c9108a54fa (diff) | |
test: use assertRun instead of runProcess where possible
The case_decrypt_tls.test_tls_rsa_pq test is unexpectedly passing when
GnuTLS is disabled. It checks for '/' in the output, but that also
matches an error message. Use assertRun here and pretty much everywhere
else to catch such issues. Remove a few redundant returncode checks.
Change-Id: I0f9d1dadc0ca73eef9cffb3e2f452aa7c8395c95
Reviewed-on: https://code.wireshark.org/review/30838
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'test/suite_clopts.py')
| -rw-r--r-- | test/suite_clopts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/suite_clopts.py b/test/suite_clopts.py index 4a0d7b10ce..b1e020c560 100644 --- a/test/suite_clopts.py +++ b/test/suite_clopts.py @@ -152,7 +152,7 @@ class case_tshark_name_resolution_clopts(subprocesstest.SubprocessTestCase): class case_tshark_unicode_clopts(subprocesstest.SubprocessTestCase): def test_tshark_unicode_display_filter(self, cmd_tshark, capture_file): '''Unicode (UTF-8) display filter''' - self.runProcess((cmd_tshark, '-r', capture_file('http.pcap'), '-Y', 'tcp.flags.str == "·······AP···"')) + self.assertRun((cmd_tshark, '-r', capture_file('http.pcap'), '-Y', 'tcp.flags.str == "·······AP···"')) self.assertTrue(self.grepOutput('HEAD.*/v4/iuident.cab')) @@ -180,7 +180,7 @@ class case_tshark_dump_glossaries(subprocesstest.SubprocessTestCase): self.assertTrue(decoded, '{} is not valid UTF-8'.format(glossary)) def test_tshark_glossary_plugin_count(self, cmd_tshark, base_env): - self.runProcess((cmd_tshark, '-G', 'plugins'), env=base_env) + self.assertRun((cmd_tshark, '-G', 'plugins'), env=base_env) self.assertGreaterEqual(self.countOutput('dissector'), 10, 'Fewer than 10 dissector plugins found') def test_tshark_elastic_mapping(self, cmd_tshark, dirs, base_env): |