Move conftest.py up a level

This commit is contained in:
David Vierra 2016-06-15 17:27:07 -10:00
parent 2670bd149a
commit 0a164dd9b3

View File

@ -7,14 +7,17 @@ from os.path import dirname, basename
import py
import pytest
import logging
logging.basicConfig(level=logging.INFO)
from mceditlib.worldeditor import WorldEditor
_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)
@pytest.fixture
@ -42,6 +45,10 @@ def indev_file(tmpdir):
def pc_world(tmpdir):
return copy_temp_level(tmpdir, "AnvilWorld")
@pytest.fixture
def testbed_schem(tmpdir):
return copy_temp_level(tmpdir, "testbed.schematic")
@pytest.fixture(params=["Station.schematic"])
def schematic_world(tmpdir, request):