diff options
| author | Dario Lombardo <lomato@gmail.com> | 2019-12-20 16:07:45 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-12-20 22:25:31 +0000 |
| commit | 69c0a10400b3371c84df7e6b4f5027751db7b46c (patch) | |
| tree | 2ea07870de7f817bf98b99e808bf048697bb7a84 /test | |
| parent | 746335804b012d79be86c26613cb8240a7f74e24 (diff) | |
test: fix extcap_name fixture and skip test.
dpauxmon relies on libnl that is linux specific. Skip the test
for other platforms.
Fix skip message while here.
Change-Id: I744d83d0a56e41e1c32e45ade8ca0d9dd29876e1
Reviewed-on: https://code.wireshark.org/review/35525
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures_ws.py | 5 | ||||
| -rw-r--r-- | test/suite_extcaps.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/fixtures_ws.py b/test/fixtures_ws.py index 79eb0c092a..e4cff119c1 100644 --- a/test/fixtures_ws.py +++ b/test/fixtures_ws.py @@ -148,7 +148,10 @@ def wireshark_command(cmd_wireshark): @fixtures.fixture(scope='session') def cmd_extcap(program): def extcap_name(name): - return program(os.path.join('extcap', name)) + if sys.platform == 'darwin': + return program(os.path.join('Wireshark.app/Contents/MacOS/extcap', name)) + else: + return program(os.path.join('extcap', name)) return extcap_name diff --git a/test/suite_extcaps.py b/test/suite_extcaps.py index a5b5ddf5b0..d086d92ef5 100644 --- a/test/suite_extcaps.py +++ b/test/suite_extcaps.py @@ -65,8 +65,8 @@ class case_extcaps(subprocesstest.SubprocessTestCase): def test_dpauxmon(self, check_extcap_execution): ''' extcap interface tests for dpauxmon ''' - if sys.platform == 'win32': - fixtures.skip('dpauxmon not available on Windows') + if not sys.platform.startswith('linux'): + fixtures.skip('dpauxmon available on Linux only') check_extcap_execution("dpauxmon") def test_randpktdump(self, check_extcap_execution): @@ -76,7 +76,7 @@ class case_extcaps(subprocesstest.SubprocessTestCase): def test_sdjournal(self, check_extcap_execution): ''' extcap interface tests for sdjournal ''' if not sys.platform.startswith('linux'): - fixtures.skip('sdjournal available on Linux only') + fixtures.skip('sdjournal is available on Linux only') check_extcap_execution("sdjournal") def test_sshdump(self, check_extcap_execution): |