diff options
| author | Vasil Velichkov <vvvelichkov@gmail.com> | 2019-01-28 21:09:46 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-01-28 21:03:04 +0000 |
| commit | 311dc2f14a653738927d6a374e67610fe3a669bf (patch) | |
| tree | fe037627eae21ba1e648942b04bdf033a8938848 /test | |
| parent | 90cf07501682bd0e654b731ea2240ed3009769e3 (diff) | |
tests: Skip Lua related tests when Lua is not present
Change-Id: I46ea83c0295d53f3b0b1d7f372c4fef2fb292e6c
Reviewed-on: https://code.wireshark.org/review/31785
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'test')
| -rw-r--r-- | test/suite_clopts.py | 4 | ||||
| -rw-r--r-- | test/suite_wslua.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/suite_clopts.py b/test/suite_clopts.py index e598828896..a0fe07bbf7 100644 --- a/test/suite_clopts.py +++ b/test/suite_clopts.py @@ -198,8 +198,10 @@ class case_tshark_dump_glossaries(subprocesstest.SubprocessTestCase): del ip_props[key] self.assertEqual(actual_obj, expected_obj) - def test_tshark_unicode_folders(self, cmd_tshark, unicode_env): + def test_tshark_unicode_folders(self, cmd_tshark, unicode_env, features): '''Folders output with unicode''' + if not features.have_lua: + self.skipTest('Test requires Lua scripting support.') proc = self.assertRun((cmd_tshark, '-G', 'folders'), env=unicode_env.env) out = proc.stdout_str pluginsdir = [x.split('\t', 1)[1] for x in out.splitlines() if x.startswith('Personal Lua Plugins:')] diff --git a/test/suite_wslua.py b/test/suite_wslua.py index 0119609f7f..a0a71ca790 100644 --- a/test/suite_wslua.py +++ b/test/suite_wslua.py @@ -29,7 +29,7 @@ wpa_induction_pcap_gz = 'wpa-Induction.pcap.gz' @fixtures.fixture(scope='session') def check_lua_script(cmd_tshark, features, dirs, capture_file): if not features.have_lua: - self.skipTest('Test requires Lua scripting support.') + fixtures.skip('Test requires Lua scripting support.') def check_lua_script_real(self, lua_script, cap_file, check_passed, *args): tshark_cmd = [cmd_tshark, '-r', capture_file(cap_file), |