Skip to content

Commit 4968d29

Browse files
committed
use os.makedirs/shutil.copy2 instead of cp from scripting
1 parent c5187e7 commit 4968d29

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

bmi_tester/tests/conftest.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import os
44
import shutil
55
from collections.abc import Generator
6-
from packaging.version import Version
76

87
import pytest
8+
from packaging.version import Version
99

1010

1111
@contextlib.contextmanager
@@ -61,7 +61,7 @@ def load_component(entry_point):
6161
Bmi = None
6262
else:
6363
Bmi = load_component(class_to_test)
64-
INPUT_FILE = os.environ.get("BMITEST_INPUT_FILE", None)
64+
INPUT_FILE = os.environ.get("BMITEST_INPUT_FILE")
6565
# BMI_VERSION_STRING = os.environ.get("BMI_VERSION_STRING", "1.1")
6666
BMI_VERSION_STRING = os.environ.get("BMI_VERSION_STRING", "2.0")
6767
BMI_VERSION = Version(BMI_VERSION_STRING)
@@ -87,9 +87,9 @@ def get_test_parameters(infile=None, count=0):
8787
infile = infile or INPUT_FILE
8888

8989
try:
90-
with open(".ROOT_DIR", "r") as fp:
90+
with open(".ROOT_DIR") as fp:
9191
root_dir = fp.read()
92-
except IOError:
92+
except OSError:
9393
root_dir = "."
9494
if count > 1:
9595
raise RuntimeError()
@@ -127,7 +127,7 @@ def bmi():
127127

128128
@pytest.fixture(scope="session")
129129
def initialized_bmi(tmpdir_factory, infile=None, manifest=None):
130-
infile = os.environ.get("BMITEST_INPUT_FILE", None)
130+
infile = os.environ.get("BMITEST_INPUT_FILE")
131131
manifest = os.environ.get("BMITEST_MANIFEST", infile or "").splitlines()
132132

133133
tmp = tmpdir_factory.mktemp("data")
@@ -145,12 +145,13 @@ def initialized_bmi(tmpdir_factory, infile=None, manifest=None):
145145

146146
@pytest.fixture(scope="function")
147147
def staged_tmpdir(tmpdir, infile=None, manifest=None):
148-
infile = os.environ.get("BMITEST_INPUT_FILE", None)
148+
infile = os.environ.get("BMITEST_INPUT_FILE")
149149
manifest = os.environ.get("BMITEST_MANIFEST", infile or "").splitlines()
150150
with tmpdir.as_cwd() as prev:
151151
for file_ in [fname.strip() for fname in manifest]:
152152
if file_:
153-
cp(os.path.join(str(prev), file_), tmpdir / file_, create_dirs=True)
153+
os.makedirs(tmpdir / os.path.dirname(file_), exist_ok=True)
154+
shutil.copy2(prev / file_, tmpdir / file_)
154155
return tmpdir
155156

156157

0 commit comments

Comments
 (0)