Wireshark · Wireshark-commits: [Wireshark-commits] master-3.0 ea955a5: test: add support for pytest 5.2.0

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ea955a5ae7a43f3743df378c1fd2c81223000e16
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

ea955a5 by Peter Wu (peter@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit ba35c23205490c0f1635239f5b29350ed0641511)
    Reviewed-on: https://code.wireshark.org/review/34685
    

Actions performed:

    from  34db9a0   IS-IS: add missing TLV 138 dissection for l1 LSP
     add  ea955a5   test: add support for pytest 5.2.0


Summary of changes:
 test/fixtures.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)