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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2e411dba93bf2ceecf3dd201b2d100864229ce02
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

2e411db by Peter Wu (peter@xxxxxxxxxxxxx):

    test: allow running pytest without specifying the tests directory
    
    This allows `pytest` to be executed from the top-level source or build
    directory (or any other directory below).
    
    Change-Id: Ib7af2ea2aaf01319d6839d2dc67228fbb5a7bc34
    Reviewed-on: https://code.wireshark.org/review/31370
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  f100f7f   maxmind_db: Close our pipe FDs inside a lock.
     add  2e411db   test: allow running pytest without specifying the tests directory


Summary of changes:
 .travis.yml      | 2 +-
 CMakeLists.txt   | 9 +++++++++
 appveyor.yml     | 2 +-
 pytest.ini       | 4 ++++
 test/conftest.py | 9 +++++++--
 test/pytest.ini  | 3 ---
 6 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 pytest.ini
 delete mode 100644 test/pytest.ini