Commitae3a56b

committed

wip: testing things

1 parentb8824a6 commitae3a56bCopy full SHA for ae3a56b

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`importargparse`
`2`	`2`	`importfunctools`
`3`	`3`	`importos`
	`4`	`+importpathlib`
`4`	`5`	`importre`
`5`	`6`	`importsys`
`6`	`7`	`importtextwrap`
`@@ -299,11 +300,15 @@ def _parse_value(v: Any) -> Any:`
`299`	`300`	`ifisinstance(v,str)andv.startswith("@"):`
`300`	`301`	`# If the user-provided value starts with @, we try to read the file`
`301`	`302`	`# path provided after @ as the real value. Exit on any error.`
	`303`	`+filepath=pathlib.Path(v[1:]).expanduser().resolve()`
`302`	`304`	`try:`
`303`		`-withopen(v[1:],encoding="utf-8")asf:`
	`305`	`+withopen(filepath,encoding="utf-8")asf:`
`304`	`306`	`returnf.read()`
`305`		`-exceptExceptionase:`
`306`		`-sys.stderr.write(f"{e}\n")`
	`307`	`+exceptUnicodeDecodeError:`
	`308`	`+withopen(filepath,"rb")asf:`
	`309`	`+returnf.read()`
	`310`	`+except (FileNotFoundError,PermissionError)asexc:`
	`311`	`+sys.stderr.write(f"{exc}\n")`
`307`	`312`	`sys.exit(1)`
`308`	`313`
`309`	`314`	`returnv`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -540,12 +540,15 @@ def test_update_application_settings(gitlab_cli):`
`540`	`540`	`assertret.success`
`541`	`541`
`542`	`542`
`543`		`-deftest_create_project_with_values_from_file(gitlab_cli,tmpdir):`
	`543`	`+deftest_create_project_with_values_from_file(gitlab_cli,fixture_dir,tmpdir):`
`544`	`544`	`name="gitlab-project-from-file"`
`545`	`545`	`description="Multiline\n\nData\n"`
`546`	`546`	`from_file=tmpdir.join(name)`
`547`	`547`	`from_file.write(description)`
`548`	`548`	`from_file_path=f"@{str(from_file)}"`
	`549`	`+avatar_file=fixture_dir/"avatar.png"`
	`550`	`+assertavatar_file.exists()`
	`551`	`+avatar_file_path=f"@{avatar_file}"`
`549`	`552`
`550`	`553`	`cmd= [`
`551`	`554`	`"-v",`
`@@ -555,6 +558,8 @@ def test_create_project_with_values_from_file(gitlab_cli, tmpdir):`
`555`	`558`	`name,`
`556`	`559`	`"--description",`
`557`	`560`	`from_file_path,`
	`561`	`+"--avatar",`
	`562`	`+avatar_file_path,`
`558`	`563`	`]`
`559`	`564`	`ret=gitlab_cli(cmd)`
`560`	`565`

Comments

(0)