firebird/firebird-qa
6
0
Fork 0
mirror of https://github.com/FirebirdSQL/firebird-qa.git synced 2025-02-02 02:40:42 +01:00
Code Issues Activity

Fix tmpdir permission problem introduced by pytest 6.2.2

Browse Source
This commit is contained in:
Pavel Císař 2021-04-27 15:20:56 +02:00
parent 7a9962e6bf
commit 9448884c94
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firebird/qa/plugin.py
View File

@ -110,6 +110,7 @@ def pytest_configure(config):
_vars_['firebird-config'] = config_path _vars_['firebird-config'] = config_path
driver_config.register_database('pytest') driver_config.register_database('pytest')
# #
_vars_['basetemp'] = config.getoption('basetemp')
_vars_['runslow'] = config.getoption('runslow') _vars_['runslow'] = config.getoption('runslow')
_vars_['root'] = config.rootpath _vars_['root'] = config.rootpath
path = config.rootpath / 'databases' path = config.rootpath / 'databases'
@ -165,8 +166,6 @@ def firebird_server():
with connect_server(_vars_['server']) as srv: with connect_server(_vars_['server']) as srv:
yield srv yield srv
def substitute_macros(text: str, macros: Dict[str, str]): def substitute_macros(text: str, macros: Dict[str, str]):
f_text = text f_text = text
for (pattern, replacement) in macros.items(): for (pattern, replacement) in macros.items():
@ -278,6 +277,12 @@ class Database:
@pytest.fixture @pytest.fixture
def db_path(tmp_path) -> Path: def db_path(tmp_path) -> Path:
if platform.system != 'Windows': if platform.system != 'Windows':
base = _vars_['basetemp']
if base is None:
os.chmod(tmp_path.parent, 16895)
os.chmod(tmp_path.parent.parent, 16895)
else:
os.chmod(Path(base), 16895)
os.chmod(tmp_path, 16895) os.chmod(tmp_path, 16895)
return tmp_path return tmp_path