Move conftest.py up a level
This commit is contained in:
parent
2670bd149a
commit
0a164dd9b3
@ -7,14 +7,17 @@ from os.path import dirname, basename
|
|||||||
import py
|
import py
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
import logging
|
||||||
|
logging.basicConfig(level=logging.INFO)
|
||||||
|
|
||||||
from mceditlib.worldeditor import WorldEditor
|
from mceditlib.worldeditor import WorldEditor
|
||||||
|
|
||||||
|
|
||||||
_TEST_FILES_DIR = "test_files"
|
_TEST_FILES_DIR = "test_files"
|
||||||
|
|
||||||
# from $PROJECT/tests/test_mceditlib/conftest.py, get to $PROJECT/test_files
|
# from $PROJECT/tests/conftest.py, get to $PROJECT/test_files
|
||||||
|
|
||||||
_PROJECT = dirname(dirname(dirname(__file__)))
|
_PROJECT = dirname(dirname(__file__))
|
||||||
TEST_FILES_DIR = py.path.local(_PROJECT).join(_TEST_FILES_DIR)
|
TEST_FILES_DIR = py.path.local(_PROJECT).join(_TEST_FILES_DIR)
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
@ -42,6 +45,10 @@ def indev_file(tmpdir):
|
|||||||
def pc_world(tmpdir):
|
def pc_world(tmpdir):
|
||||||
return copy_temp_level(tmpdir, "AnvilWorld")
|
return copy_temp_level(tmpdir, "AnvilWorld")
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def testbed_schem(tmpdir):
|
||||||
|
return copy_temp_level(tmpdir, "testbed.schematic")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=["Station.schematic"])
|
@pytest.fixture(params=["Station.schematic"])
|
||||||
def schematic_world(tmpdir, request):
|
def schematic_world(tmpdir, request):
|
Reference in New Issue
Block a user