Commit84632c7

committed

Extractsubprocess.run logic repeated intest_installation

This creates a function (technically, a callable `partial` object)for `test_installation` to use instead of repeating `subproces.run`keyword arguments all the time.This relates directly to steps in `_set_up_venv`, and it's makesabout as much sense to do it there as in `test_installation`, so itis placed (and described) in `_set_up_venv`.

1 parent953d161 commit84632c7Copy full SHA for 84632c7

File tree

1 file changed

+14

-22

lines changed

test
- test_installation.py

1 file changed

+14

-22

lines changed

`‎test/test_installation.py‎`

Lines changed: 14 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`# 3-Clause BSD License: https://opensource.org/license/bsd-3-clause/`
`3`	`3`
`4`	`4`	`importast`
	`5`	`+importfunctools`
`5`	`6`	`importos`
`6`	`7`	`importsubprocess`
`7`	`8`
`@@ -11,35 +12,23 @@`
`11`	`12`	`classTestInstallation(TestBase):`
`12`	`13`	`@with_rw_directory`
`13`	`14`	`deftest_installation(self,rw_dir):`
`14`		`-venv=self._set_up_venv(rw_dir)`
	`15`	`+venv,run=self._set_up_venv(rw_dir)`
`15`	`16`
`16`		`-result=subprocess.run(`
`17`		`- [venv.pip,"install","."],`
`18`		`-stdout=subprocess.PIPE,`
`19`		`-cwd=venv.sources,`
`20`		`- )`
	`17`	`+result=run([venv.pip,"install","."])`
`21`	`18`	`self.assertEqual(`
`22`	`19`	`0,`
`23`	`20`	`result.returncode,`
`24`	`21`	`msg=result.stderrorresult.stdoutor"Can't install project",`
`25`	`22`	`)`
`26`	`23`
`27`		`-result=subprocess.run(`
`28`		`- [venv.python,"-c","import git"],`
`29`		`-stdout=subprocess.PIPE,`
`30`		`-cwd=venv.sources,`
`31`		`- )`
	`24`	`+result=run([venv.python,"-c","import git"])`
`32`	`25`	`self.assertEqual(`
`33`	`26`	`0,`
`34`	`27`	`result.returncode,`
`35`	`28`	`msg=result.stderrorresult.stdoutor"Self-test failed",`
`36`	`29`	`)`
`37`	`30`
`38`		`-result=subprocess.run(`
`39`		`- [venv.python,"-c","import gitdb; import smmap"],`
`40`		`-stdout=subprocess.PIPE,`
`41`		`-cwd=venv.sources,`
`42`		`- )`
	`31`	`+result=run([venv.python,"-c","import gitdb; import smmap"])`
`43`	`32`	`self.assertEqual(`
`44`	`33`	`0,`
`45`	`34`	`result.returncode,`
`@@ -49,11 +38,7 @@ def test_installation(self, rw_dir):`
`49`	`38`	`# Even IF gitdb or any other dependency is supplied during development by`
`50`	`39`	`# inserting its location into PYTHONPATH or otherwise patched into sys.path,`
`51`	`40`	`# make sure it is not wrongly inserted as the first entry.`
`52`		`-result=subprocess.run(`
`53`		`- [venv.python,"-c","import sys; import git; print(sys.path)"],`
`54`		`-stdout=subprocess.PIPE,`
`55`		`-cwd=venv.sources,`
`56`		`- )`
	`41`	`+result=run([venv.python,"-c","import sys; import git; print(sys.path)"])`
`57`	`42`	`syspath=result.stdout.decode("utf-8").splitlines()[0]`
`58`	`43`	`syspath=ast.literal_eval(syspath)`
`59`	`44`	`self.assertEqual(`
`@@ -74,4 +59,11 @@ def _set_up_venv(rw_dir):`
`74`	`59`	`target_is_directory=True,`
`75`	`60`	`)`
`76`	`61`
`77`		`-returnvenv`
	`62`	`+# Create a convenience function to run commands in it.`
	`63`	`+run=functools.partial(`
	`64`	`+subprocess.run,`
	`65`	`+stdout=subprocess.PIPE,`
	`66`	`+cwd=venv.sources,`
	`67`	`+ )`
	`68`	`+`
	`69`	`+returnvenv,run`

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!

Uh oh!

Commit84632c7

File tree

1 file changed

1 file changed

`‎test/test_installation.py‎`

0 commit comments