Skip to content

Commit

Permalink
tox-dev#773 revert breaking change of tox.cmdline not callable with n…
Browse files Browse the repository at this point in the history
…o args
  • Loading branch information
gaborbernat committed Mar 16, 2018
1 parent 765c977 commit f0c3528
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -23,3 +23,5 @@ htmlcov
.idea
.eggs/
py27/

.*_cache
3 changes: 2 additions & 1 deletion tests/test_z_cmdline.py
Expand Up @@ -902,8 +902,9 @@ def test_tox_quickstart_script():


def test_tox_cmdline(monkeypatch):
monkeypatch.setattr(sys, 'args', ['caller_script', '--help'])
with pytest.raises(SystemExit):
tox.cmdline(['caller_script', '--help'])
tox.cmdline()


@pytest.mark.parametrize('exit_code', [0, 6])
Expand Down
2 changes: 1 addition & 1 deletion tox/__init__.py
Expand Up @@ -84,6 +84,6 @@ def __init__(self, message):
super(exception.MinVersionError, self).__init__(message)


from .session import main as cmdline # noqa
from .session import run_main as cmdline # noqa

__all__ = ('hookspec', 'hookimpl', 'cmdline', 'exception', '__version__')

0 comments on commit f0c3528

Please sign in to comment.