NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commit2f550d8

authored

Testgres tests create log dir in exact place (#243)

When we do not define TEST_CFG__LOG_DIR it is expected the testgres tests will create a log directory in a root of testgres project folder.We used config.rootpath for detect this folder in pytest_configure function.It was occurred that config.rootpath can point to another (unexpected) place.So we will use exact code to calculate testgres project folder (see TestStartupData.GetRootLogDir) to avid this problem.

1 parent94d7572 commit2f550d8Copy full SHA for 2f550d8

File tree

1 file changed

+21

-7

lines changed

tests
- conftest.py

1 file changed

+21

-7

lines changed

`‎tests/conftest.py`

Lines changed: 21 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,17 @@ def CalcRootDir() -> str:`
`50`	`50`	`r=os.path.abspath(r)`
`51`	`51`	`returnr`
`52`	`52`
	`53`	`+# --------------------------------------------------------------------`
	`54`	`+defCalcRootLogDir()->str:`
	`55`	`+ifTestConfigPropNames.TEST_CFG__LOG_DIRinos.environ:`
	`56`	`+resultPath=os.environ[TestConfigPropNames.TEST_CFG__LOG_DIR]`
	`57`	`+else:`
	`58`	`+rootDir=__class__.CalcRootDir()`
	`59`	`+resultPath=os.path.join(rootDir,"logs")`
	`60`	`+`
	`61`	`+asserttype(resultPath)==str# noqa: E721`
	`62`	`+returnresultPath`
	`63`	`+`
`53`	`64`	`# --------------------------------------------------------------------`
`54`	`65`	`defCalcCurrentTestWorkerSignature()->str:`
`55`	`66`	`currentPID=os.getpid()`
`@@ -86,11 +97,18 @@ class TestStartupData:`
`86`	`97`	`TestStartupData__Helper.CalcCurrentTestWorkerSignature()`
`87`	`98`	`)`
`88`	`99`
	`100`	`+sm_RootLogDir:str=TestStartupData__Helper.CalcRootLogDir()`
	`101`	`+`
`89`	`102`	`# --------------------------------------------------------------------`
`90`	`103`	`defGetRootDir()->str:`
`91`	`104`	`asserttype(__class__.sm_RootDir)==str# noqa: E721`
`92`	`105`	`return__class__.sm_RootDir`
`93`	`106`
	`107`	`+# --------------------------------------------------------------------`
	`108`	`+defGetRootLogDir()->str:`
	`109`	`+asserttype(__class__.sm_RootLogDir)==str# noqa: E721`
	`110`	`+return__class__.sm_RootLogDir`
	`111`	`+`
`94`	`112`	`# --------------------------------------------------------------------`
`95`	`113`	`defGetCurrentTestWorkerSignature()->str:`
`96`	`114`	`asserttype(__class__.sm_CurrentTestWorkerSignature)==str# noqa: E721`
`@@ -954,13 +972,9 @@ def pytest_configure(config: pytest.Config) -> None:`
`954`	`972`	`log_name=TestStartupData.GetCurrentTestWorkerSignature()`
`955`	`973`	`log_name+=".log"`
`956`	`974`
`957`		`-ifTestConfigPropNames.TEST_CFG__LOG_DIRinos.environ:`
`958`		`-log_path_v=os.environ[TestConfigPropNames.TEST_CFG__LOG_DIR]`
`959`		`-log_path=pathlib.Path(log_path_v)`
`960`		`-else:`
`961`		`-log_path=config.rootpath.joinpath("logs")`
	`975`	`+log_dir=TestStartupData.GetRootLogDir()`
`962`	`976`
`963`		`-log_path.mkdir(exist_ok=True)`
	`977`	`+pathlib.Path(log_dir).mkdir(exist_ok=True)`
`964`	`978`
`965`	`979`	`logging_plugin:_pytest.logging.LoggingPlugin=config.pluginmanager.get_plugin(`
`966`	`980`	`"logging-plugin"`
`@@ -969,7 +983,7 @@ def pytest_configure(config: pytest.Config) -> None:`
`969`	`983`	`assertlogging_pluginisnotNone`
`970`	`984`	`assertisinstance(logging_plugin,_pytest.logging.LoggingPlugin)`
`971`	`985`
`972`		`-logging_plugin.set_log_path(str(log_path/log_name))`
	`986`	`+logging_plugin.set_log_path(os.path.join(log_dir,log_name))`
`973`	`987`
`974`	`988`
`975`	`989`	`# /////////////////////////////////////////////////////////////////////////////`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2f550d8

File tree

1 file changed

1 file changed

`‎tests/conftest.py`

0 commit comments