Commite47cded

committed

[remote_ops] A problem with mktemp on Alpine Linux is fixed

Five 'X' in template is not enough - Alpine returns "mktemp: : Invalid argument" error.Six 'X' is OK.

1 parentddcaea0 commite47cdedCopy full SHA for e47cded

File tree

+36

-2

lines changed

+36

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ def mkdtemp(self, prefix=None):`
`316`	`316`	`- prefix (str): The prefix of the temporary directory name.`
`317`	`317`	`"""`
`318`	`318`	`ifprefix:`
`319`		`-command= ["mktemp","-d","-t",prefix+"XXXXX"]`
	`319`	`+command= ["mktemp","-d","-t",prefix+"XXXXXX"]`
`320`	`320`	`else:`
`321`	`321`	`command= ["mktemp","-d"]`
`322`	`322`
`@@ -344,7 +344,7 @@ def mkstemp(self, prefix=None):`
`344`	`344`	`- prefix (str): The prefix of the temporary directory name.`
`345`	`345`	`"""`
`346`	`346`	`ifprefix:`
`347`		`-command= ["mktemp","-t",prefix+"XXXXX"]`
	`347`	`+command= ["mktemp","-t",prefix+"XXXXXX"]`
`348`	`348`	`else:`
`349`	`349`	`command= ["mktemp"]`
`350`	`350`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`importpytest`
`5`	`5`	`importre`
`6`	`6`	`importtempfile`
	`7`	`+importlogging`
`7`	`8`
`8`	`9`	`from ..testgresimportExecUtilException`
`9`	`10`	`from ..testgresimportInvalidOperationException`
`@@ -18,6 +19,22 @@ class TestLocalOperations:`
`18`	`19`	`defsetup(self):`
`19`	`20`	`self.operations=LocalOperations()`
`20`	`21`
	`22`	`+deftest_mkdtemp__default(self):`
	`23`	`+path=self.operations.mkdtemp()`
	`24`	`+logging.info("Path is [{0}].".format(path))`
	`25`	`+assertos.path.exists(path)`
	`26`	`+os.rmdir(path)`
	`27`	`+assertnotos.path.exists(path)`
	`28`	`+`
	`29`	`+deftest_mkdtemp__custom(self):`
	`30`	`+C_TEMPLATE="abcdef"`
	`31`	`+path=self.operations.mkdtemp(C_TEMPLATE)`
	`32`	`+logging.info("Path is [{0}].".format(path))`
	`33`	`+assertos.path.exists(path)`
	`34`	`+assertC_TEMPLATEinos.path.basename(path)`
	`35`	`+os.rmdir(path)`
	`36`	`+assertnotos.path.exists(path)`
	`37`	`+`
`21`	`38`	`deftest_exec_command_success(self):`
`22`	`39`	`"""`
`23`	`40`	`Test exec_command for successful command execution.`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`importpytest`
`5`	`5`	`importre`
`6`	`6`	`importtempfile`
	`7`	`+importlogging`
`7`	`8`
`8`	`9`	`from ..testgresimportExecUtilException`
`9`	`10`	`from ..testgresimportInvalidOperationException`
`@@ -110,6 +111,22 @@ def test_makedirs_failure(self):`
`110`	`111`	`withpytest.raises(Exception):`
`111`	`112`	`self.operations.makedirs(path)`
`112`	`113`
	`114`	`+deftest_mkdtemp__default(self):`
	`115`	`+path=self.operations.mkdtemp()`
	`116`	`+logging.info("Path is [{0}].".format(path))`
	`117`	`+assertos.path.exists(path)`
	`118`	`+os.rmdir(path)`
	`119`	`+assertnotos.path.exists(path)`
	`120`	`+`
	`121`	`+deftest_mkdtemp__custom(self):`
	`122`	`+C_TEMPLATE="abcdef"`
	`123`	`+path=self.operations.mkdtemp(C_TEMPLATE)`
	`124`	`+logging.info("Path is [{0}].".format(path))`
	`125`	`+assertos.path.exists(path)`
	`126`	`+assertC_TEMPLATEinos.path.basename(path)`
	`127`	`+os.rmdir(path)`
	`128`	`+assertnotos.path.exists(path)`
	`129`	`+`
`113`	`130`	`deftest_rmdirs(self):`
`114`	`131`	`path=self.operations.mkdtemp()`
`115`	`132`	`assertos.path.exists(path)`

Comments

(0)