Skip to content

Commit 88eadf8

Browse files
committed
1 parent ad1886b commit 88eadf8

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move pytest_plugins to top-level conftest (fix for pytest >4.0)

test/conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
import pytest
1313

14+
pytest_plugins = ['b2sdk.v3.testing']
15+
1416

1517
@pytest.fixture
1618
def bg_executor():

test/integration/conftest.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)