Benjamin Schubert pushed to branch bschubert/remove-pytest-runner at BuildStream / buildstream
Commits:
- 
bc3ff933
by Benjamin Schubert at 2018-10-24T15:24:19Z
1 changed file:
Changes:
| ... | ... | @@ -242,7 +242,7 @@ class PyTest(TestCommand): | 
| 242 | 242 |          if self.index_url is not None:
 | 
| 243 | 243 |              if self.distribution.command_options.get("easy_install") is None:
 | 
| 244 | 244 |                  self.distribution.command_options["easy_install"] = {}
 | 
| 245 | -                
 | |
| 245 | + | |
| 246 | 246 |              self.distribution.command_options["easy_install"]["index_url"] = (
 | 
| 247 | 247 |                  "cmdline", self.index_url,
 | 
| 248 | 248 |              )
 | 
| ... | ... | @@ -252,7 +252,7 @@ class PyTest(TestCommand): | 
| 252 | 252 |          import shlex
 | 
| 253 | 253 |          import pytest
 | 
| 254 | 254 |  | 
| 255 | -        errno = pytest.main(shlex.split(self.pytest_args))
 | |
| 255 | +        errno = pytest.main(shlex.split(self.addopts))
 | |
| 256 | 256 |  | 
| 257 | 257 |          if errno:
 | 
| 258 | 258 |              msg = 'Test failed: %s' % test.result
 | 
