aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_map.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2019-10-02 02:26:00 +0100
committerPeter Wu <peter@lekensteyn.nl>2019-10-02 09:59:39 +0000
commitba35c23205490c0f1635239f5b29350ed0641511 (patch)
tree8ca9a53371863f30cb2abb499d0b95272595da7c /epan/dissectors/packet-gsm_map.c
parente21bb9f7ed22dfc94f768c333f34ddc549cd3ea6 (diff)
test: add support for pytest 5.2.0
pytest 5.2.0 added support for callable scopes. In order to distinguish those (`@pytest.fixture(scope=fn)`) from decorators (`@pytest.fixture`), it added extra arguments which was not expected by our wrapper. See https://github.com/pytest-dev/pytest/pull/5776 for the change. Fixes the following error: ImportError while loading conftest 'test/conftest.py'. test/conftest.py:42: in <module> from fixtures_ws import * test/fixtures_ws.py:198: in <module> @fixtures.fixture test/fixtures.py:36: in fixture return pytest.fixture(scope, params, autouse, ids, name) E TypeError: 'bool' object is not iterable We do not use non-keyword arguments, so it is safe to use `*` instead of `*args` in the prototype. Change-Id: I96220e0e85249ad58880e5de75f8987a0fdc16ef Reviewed-on: https://code.wireshark.org/review/34672 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-gsm_map.c')
0 files changed, 0 insertions, 0 deletions