Merged branch features into features

Author: sallner

AUTHORS

@@ -100,6 +100,7 @@ Samuele Pedroni
 Steffen Allner
 Stephan Obermann
 Tareq Alayan
+Ted Xiao
 Simon Gomizelj
 Stefano Taschini
 Stefan Farmbauer
@@ -109,3 +110,4 @@ Trevor Bekolay
 Vasily Kuznetsov
 Wouter van Ackooy
 Bernard Pratz
+Stefan Zimmermann

CHANGELOG.rst

@@ -1,3 +1,40 @@
+3.0.0.dev1
+==========
+
+**Changes**
+
+*
+
+*
+
+*
+
+* Fix (`#607`_): pytest.skip() is no longer allowed at module level to
+  prevent misleading use as test function decorator. When used at a module
+  level an error will be raised during collection.
+  Thanks `@omarkohl`_ for the complete PR (`#1519`_).
+
+*
+
+**Incompatible changes**
+
+* Removing the following deprecated commandline options
+
+  * ``--genscript``
+  * ``--no-assert``
+  * ``--nomagic``
+  * ``--report``
+
+  Thanks to `@RedBeardCode`_ for the PR(`#1664`_)
+
+* removed support code for python 3 < 3.3 addressing (`#1627`_)
+
+.. _#607: https://github.com/pytest-dev/pytest/issues/607
+.. _#1519: https://github.com/pytest-dev/pytest/pull/1519
+.. _#1664: https://github.com/pytest-dev/pytest/pull/1664
+.. _#1627: https://github.com/pytest-dev/pytest/pull/1627
+
+
 2.10.0.dev1
 ===========
 
@@ -58,6 +95,19 @@
   finalizer and has access to the fixture's result cache.
   Thanks `@d6e`_, `@sallner`_
 
+* Issue a warning for asserts whose test is a tuple literal. Such asserts will
+  never fail because tuples are always truthy and are usually a mistake
+  (see `#1562`_). Thanks `@kvas-it`_, for the PR.
+
+* New cli flag ``--override-ini`` or ``-o`` that overrides values from the ini file.
+  Example '-o xfail_strict=True'. A complete ini-options can be viewed
+  by py.test --help. Thanks `@blueyed`_ and `@fengxx`_ for the PR
+
+* Remove all py.test-X* entry points. The versioned, suffixed entry points
+  were never documented and a leftover from a pre-virtualenv era. These entry
+  points also created broken entry points in wheels, so removing them also
+  removes a source of confusion for users (`#1632`_).
+  Thanks `@obestwalter`_ for the PR.
 
 **Changes**
 
@@ -118,8 +168,11 @@
   Thanks `@Vogtinator`_ for reporting. Thanks to `@RedBeardCode`_ and
   `@tomviner`_ for PR.
 
-*
+* Add proposal to docs for a new feature that enables users to combine multiple
+  fixtures into one. Thanks to `@hpk42`_ and `@hackebrot`_.
+
 
+.. _#1632: https://github.com/pytest-dev/pytest/issues/1632
 .. _#1580: https://github.com/pytest-dev/pytest/pull/1580
 .. _#1605: https://github.com/pytest-dev/pytest/issues/1605
 .. _#1597: https://github.com/pytest-dev/pytest/pull/1597
@@ -131,6 +184,8 @@
 .. _@nikratio: https://github.com/nikratio
 .. _@RedBeardCode: https://github.com/RedBeardCode
 .. _@Vogtinator: https://github.com/Vogtinator
+.. _@blueyed: https://github.com/blueyed
+.. _@fengxx: https://github.com/fengxx
 
 * Fix `#1421`_: Exit tests if a collection error occurs and add
   ``--continue-on-collection-errors`` option to restore previous behaviour.
@@ -139,6 +194,11 @@
 
 *
 
+* ``OptionGroup.addoption()`` now checks if option names were already
+  added before, to make it easier to track down issues like `#1618`_.
+  Before, you only got exceptions later from ``argparse`` library,
+  giving no clue about the actual reason for double-added options.
+
 .. _@milliams: https://github.com/milliams
 .. _@csaftoiu: https://github.com/csaftoiu
 .. _@flub: https://github.com/flub
@@ -172,10 +232,12 @@
 .. _#1619: https://github.com/pytest-dev/pytest/issues/1619
 .. _#372: https://github.com/pytest-dev/pytest/issues/372
 .. _#1544: https://github.com/pytest-dev/pytest/issues/1544
+.. _#1562: https://github.com/pytest-dev/pytest/issues/1562
 .. _#1616: https://github.com/pytest-dev/pytest/pull/1616
 .. _#1628: https://github.com/pytest-dev/pytest/pull/1628
 .. _#1629: https://github.com/pytest-dev/pytest/issues/1629
 .. _#1633: https://github.com/pytest-dev/pytest/pull/1633
+.. _#1618: https://github.com/pytest-dev/pytest/issues/1618
 
 
 **Bug Fixes**

README.rst

@@ -17,7 +17,7 @@
     :target: https://ci.appveyor.com/project/pytestbot/pytest
 
 The ``pytest`` framework makes it easy to write small tests, yet
-scales to support complex functional testing for applications and libraries.    
+scales to support complex functional testing for applications and libraries.
 
 An example of a simple test:
 
@@ -35,7 +35,7 @@ To execute it::
 
     $ pytest
     ======= test session starts ========
-    platform linux -- Python 3.4.3, pytest-2.8.5, py-1.4.31, pluggy-0.3.1    
+    platform linux -- Python 3.4.3, pytest-2.8.5, py-1.4.31, pluggy-0.3.1
     collected 1 items
 
     test_sample.py F
@@ -52,7 +52,7 @@ To execute it::
     ======= 1 failed in 0.12 seconds ========
 
 Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <http://pytest.org/latest/getting-started.html#our-first-test-run>`_ for more examples.
-        
+
 
 Features
 --------
@@ -69,7 +69,7 @@ Features
 - Can run `unittest <http://pytest.org/latest/unittest.html>`_ (or trial),
   `nose <http://pytest.org/latest/nose.html>`_ test suites out of the box;
 
-- Python2.6+, Python3.2+, PyPy-2.3, Jython-2.5 (untested);
+- Python2.6+, Python3.3+, PyPy-2.3, Jython-2.5 (untested);
 
 - Rich plugin architecture, with over 150+ `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_ and thriving community;
 

_pytest/assertion/__init__.py

@@ -25,15 +25,6 @@ def pytest_addoption(parser):
                             'rewrite' (the default) rewrites assert
                             statements in test modules on import to
                             provide assert expression information. """)
-    group.addoption('--no-assert',
-                    action="store_true",
-                    default=False,
-                    dest="noassert",
-                    help="DEPRECATED equivalent to --assert=plain")
-    group.addoption('--nomagic', '--no-magic',
-                    action="store_true",
-                    default=False,
-                    help="DEPRECATED equivalent to --assert=plain")
 
 
 class AssertionState:
@@ -48,10 +39,6 @@ def __init__(self, config, mode):
 def pytest_load_initial_conftests(early_config, parser, args):
     ns, ns_unknown_args = parser.parse_known_and_unknown_args(args)
     mode = ns.assertmode
-    no_assert = ns.noassert
-    no_magic = ns.nomagic
-    if no_assert or no_magic:
-        mode = "plain"
     if mode == "rewrite":
         try:
             import ast  # noqa

_pytest/assertion/rewrite.py

@@ -125,7 +125,7 @@ def find_module(self, name, path=None):
         co = _read_pyc(fn_pypath, pyc, state.trace)
         if co is None:
             state.trace("rewriting %r" % (fn,))
-            source_stat, co = _rewrite_test(state, fn_pypath)
+            source_stat, co = _rewrite_test(self.config, fn_pypath)
             if co is None:
                 # Probably a SyntaxError in the test.
                 return None
@@ -252,8 +252,9 @@ def _write_pyc(state, co, source_stat, pyc):
 cookie_re = re.compile(r"^[ \t\f]*#.*coding[:=][ \t]*[-\w.]+")
 BOM_UTF8 = '\xef\xbb\xbf'
 
-def _rewrite_test(state, fn):
+def _rewrite_test(config, fn):
     """Try to read and rewrite *fn* and return the code object."""
+    state = config._assertstate
     try:
         stat = fn.stat()
         source = fn.read("rb")
@@ -298,7 +299,7 @@ def _rewrite_test(state, fn):
         # Let this pop up again in the real import.
         state.trace("failed to parse: %r" % (fn,))
         return None, None
-    rewrite_asserts(tree)
+    rewrite_asserts(tree, fn, config)
     try:
         co = compile(tree, fn.strpath, "exec")
     except SyntaxError:
@@ -354,9 +355,9 @@ def _read_pyc(source, pyc, trace=lambda x: None):
         return co
 
 
-def rewrite_asserts(mod):
+def rewrite_asserts(mod, module_path=None, config=None):
     """Rewrite the assert statements in mod."""
-    AssertionRewriter().run(mod)
+    AssertionRewriter(module_path, config).run(mod)
 
 
 def _saferepr(obj):
@@ -543,6 +544,11 @@ class AssertionRewriter(ast.NodeVisitor):
 
     """
 
+    def __init__(self, module_path, config):
+        super(AssertionRewriter, self).__init__()
+        self.module_path = module_path
+        self.config = config
+
     def run(self, mod):
         """Find all assert statements in *mod* and rewrite them."""
         if not mod.body:
@@ -683,6 +689,10 @@ def visit_Assert(self, assert_):
         the expression is false.
 
         """
+        if isinstance(assert_.test, ast.Tuple) and self.config is not None:
+            fslocation = (self.module_path, assert_.lineno)
+            self.config.warn('R1', 'assertion is always true, perhaps '
+                              'remove parentheses?', fslocation=fslocation)
         self.statements = []
         self.variables = []
         self.variable_counter = itertools.count()

_pytest/config.py

@@ -64,8 +64,9 @@ class UsageError(Exception):
 
 default_plugins = (
      "mark main terminal runner python pdb unittest capture skipping "
-     "tmpdir monkeypatch recwarn pastebin helpconfig nose assertion genscript "
-     "junitxml resultlog doctest cacheprovider setuponly setupplan").split()
+     "tmpdir monkeypatch recwarn pastebin helpconfig nose assertion "
+     "junitxml resultlog doctest cacheprovider freeze_support "
+     "setuponly setupplan").split()
 
 builtin_plugins = set(default_plugins)
 builtin_plugins.add("pytester")
@@ -686,6 +687,10 @@ def addoption(self, *optnames, **attrs):
         results in help showing '--two-words' only, but --twowords gets
         accepted **and** the automatic destination is in args.twowords
         """
+        conflict = set(optnames).intersection(
+            name for opt in self.options for name in opt.names())
+        if conflict:
+            raise ValueError("option names %s already added" % conflict)
         option = Argument(*optnames, **attrs)
         self._addoption_instance(option, shortupper=False)
 
@@ -999,14 +1004,16 @@ def _getini(self, name):
             description, type, default = self._parser._inidict[name]
         except KeyError:
             raise ValueError("unknown configuration value: %r" %(name,))
-        try:
-            value = self.inicfg[name]
-        except KeyError:
-            if default is not None:
-                return default
-            if type is None:
-                return ''
-            return []
+        value = self._get_override_ini_value(name)
+        if value is None:
+            try:
+                value = self.inicfg[name]
+            except KeyError:
+                if default is not None:
+                    return default
+                if type is None:
+                    return ''
+                return []
         if type == "pathlist":
             dp = py.path.local(self.inicfg.config.path).dirpath()
             l = []
@@ -1037,6 +1044,20 @@ def _getconftest_pathlist(self, name, path):
             l.append(relroot)
         return l
 
+    def _get_override_ini_value(self, name):
+        value = None
+        # override_ini is a list of list, to support both -o foo1=bar1 foo2=bar2 and
+        # and -o foo1=bar1 -o foo2=bar2 options
+        # always use the last item if multiple value set for same ini-name,
+        # e.g. -o foo=bar1 -o foo=bar2 will set foo to bar2
+        if self.getoption("override_ini", None):
+            for ini_config_list in self.option.override_ini:
+                for ini_config in ini_config_list:
+                    (key, user_ini_value) = ini_config.split("=", 1)
+                    if key == name:
+                        value = user_ini_value
+        return value
+
     def getoption(self, name, default=notset, skip=False):
         """ return command line option value.
 

_pytest/freeze_support.py

@@ -0,0 +1,45 @@
+"""
+Provides a function to report all internal modules for using freezing tools
+pytest
+"""
+
+def pytest_namespace():
+    return {'freeze_includes': freeze_includes}
+
+
+def freeze_includes():
+    """
+    Returns a list of module names used by py.test that should be
+    included by cx_freeze.
+    """
+    import py
+    import _pytest
+    result = list(_iter_all_modules(py))
+    result += list(_iter_all_modules(_pytest))
+    return result
+
+
+def _iter_all_modules(package, prefix=''):
+    """
+    Iterates over the names of all modules that can be found in the given
+    package, recursively.
+    Example:
+        _iter_all_modules(_pytest) ->
+            ['_pytest.assertion.newinterpret',
+             '_pytest.capture',
+             '_pytest.core',
+             ...
+            ]
+    """
+    import os
+    import pkgutil
+    if type(package) is not str:
+        path, prefix = package.__path__[0], package.__name__ + '.'
+    else:
+        path = package
+    for _, name, is_package in pkgutil.iter_modules([path]):
+        if is_package:
+            for m in _iter_all_modules(os.path.join(path, name), prefix=name + '.'):
+                yield prefix + m
+        else:
+            yield prefix + name