FIX: console script invokation fails, add tests to catch it

Author: gaborbernat

.travis.yml

@@ -28,10 +28,9 @@ matrix:
  language: generic
 
 before_install:
+ - pyenv versions
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source .travis-osx; fi
- # work around https://github.com/travis-ci/travis-ci/issues/8363
- - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then pyenv global system 3.5; fi
-
+ 
 install:
  - pip install -U six
  - pip install --pre -U tox

setup.py

@@ -43,7 +43,8 @@ def main():
  author='holger krekel',
  author_email='holger@merlinux.eu',
  packages=['tox'],
- entry_points={'console_scripts': 'tox=tox:cmdline\ntox-quickstart=tox._quickstart:main'},
+ entry_points={'console_scripts': ['tox=tox:cmdline',
+ 'tox-quickstart=tox._quickstart:main']},
  python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
  setup_requires=['setuptools_scm'],
  install_requires=['py>=1.4.17',

tests/test_z_cmdline.py

@@ -1,6 +1,8 @@
 import os
 import platform
 import re
+import subprocess
+import sys
 
 import py
 import pytest
@@ -865,3 +867,19 @@ def test_missing_env_fails(initproj, cmd):
  assert result.ret == 1
  assert result.out.endswith("foo: unresolvable substitution(s): 'VAR'."
  " Environment variables are missing or defined recursively.\n")
+
+
+def test_tox_console_script():
+ result = subprocess.check_call(['tox', '--help'])
+ assert result == 0
+
+
+def test_tox_quickstart_script():
+ result = subprocess.check_call(['tox-quickstart', '--help'])
+ assert result == 0
+
+
+def test_tox_cmdline(monkeypatch):
+ monkeypatch.setattr(sys, 'argv', ['caller_scrip', '--help'])
+ with pytest.raises(SystemExit):
+ tox.cmdline()

tox/__init__.py

@@ -52,6 +52,6 @@ def __init__(self, message):
  super(exception.MinVersionError, self).__init__(message)
 
 
-from tox.session import main as cmdline # noqa
+from .session import run_main as cmdline # noqa
 
 __all__ = ('hookspec', 'hookimpl', 'cmdline', 'exception', '__version__')

tox/__main__.py

@@ -1,6 +1,4 @@
-import sys
-
-from tox.session import main
+from tox.session import run_main
 
 if __name__ == '__main__':
- main(sys.argv[1:])
+ run_main()

tox/session.py

@@ -34,6 +34,10 @@ def prepare(args):
  return config
 
 
+def run_main():
+ main(sys.argv[1:])
+
+
 def main(args):
  try:
  config = prepare(args)