* deprecate py.magic.invoke/revoke in favour of

the new py.code.patch_builtins, py.code.unpatch_builtins

* deprecate py.magic.patch/revert

* deprecate py.magic.AssertionError in favour of py.code._AssertionError

* introduced pytest_assertion plugin.

--HG--
branch : trunk

py/test/cmdline.py

@@ -5,7 +5,6 @@ import py
 #
 
 def main(args=None):
-    warn_about_missing_assertion()
     if args is None:
         args = py.std.sys.argv[1:]
     config = py.test.config
@@ -20,11 +19,3 @@ def main(args=None):
         py.std.sys.stderr.write("ERROR: %s\n" %(e.args[0],))
         raise SystemExit(3)
 
-def warn_about_missing_assertion():
-    try:
-        assert False
-    except AssertionError:
-        pass
-    else:
-        py.std.warnings.warn("Assertions are turned off!"
-                             " (are you using python -O?)")

py/test/defaultconftest.py

@@ -10,5 +10,5 @@ Generator = py.test.collect.Generator
 Function = py.test.collect.Function
 Instance = py.test.collect.Instance
 
-pytest_plugins = "default runner capture terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb pastebin unittest helpconfig nose".split()
+pytest_plugins = "default runner capture terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb pastebin unittest helpconfig nose assertion".split()
 

py/test/plugin/pytest_assertion.py

@@ -0,0 +1,68 @@
+import py
+
+def pytest_addoption(parser):
+    group = parser.getgroup("debugconfig")
+    group._addoption('--no-assert', action="store_true", default=False, 
+        dest="noassert", 
+        help="disable python assert expression reinterpretation."),
+
+def pytest_configure(config):
+    if not config.getvalue("noassert"):
+        warn_about_missing_assertion()
+        config._oldassertion = py.std.__builtin__.AssertionError 
+        py.std.__builtin__.AssertionError = py.code._AssertionError 
+
+def pytest_unconfigure(config):
+    if hasattr(config, '_oldassertion'):
+        py.std.__builtin__.AssertionError = config._oldassertion
+        del config._oldassertion
+
+def warn_about_missing_assertion():
+    try:
+        assert False
+    except AssertionError:
+        pass
+    else:
+        py.std.warnings.warn("Assertions are turned off!"
+                             " (are you using python -O?)")
+
+def test_functional(testdir):
+    testdir.makepyfile("""
+        def test_hello():
+            x = 3
+            assert x == 4
+    """)
+    result = testdir.runpytest()
+    assert "3 == 4" in result.stdout.str() 
+    result = testdir.runpytest("--no-assert")
+    assert "3 == 4" not in result.stdout.str() 
+
+def test_traceback_failure(testdir):
+    p1 = testdir.makepyfile("""
+        def g():
+            return 2
+        def f(x):
+            assert x == g()
+        def test_onefails():
+            f(3)
+    """)
+    result = testdir.runpytest(p1)
+    result.stdout.fnmatch_lines([
+        "*test_traceback_failure.py F", 
+        "====* FAILURES *====",
+        "____*____", 
+        "",
+        "    def test_onefails():",
+        ">       f(3)",
+        "",
+        "*test_*.py:6: ",
+        "_ _ _ *",
+        #"",
+        "    def f(x):",
+        ">       assert x == g()",
+        "E       assert 3 == 2",
+        "E        +  where 2 = g()",
+        "",
+        "*test_traceback_failure.py:4: AssertionError"
+    ])
+

py/test/plugin/test_pytest_terminal.py

@@ -564,36 +564,6 @@ class TestTerminalFunctional:
             "=* 1 passed in *.[0-9][0-9] seconds *=", 
         ])
 
-    def test_traceback_failure(self, testdir):
-        p1 = testdir.makepyfile("""
-            def g():
-                return 2
-            def f(x):
-                assert x == g()
-            def test_onefails():
-                f(3)
-        """)
-        result = testdir.runpytest(p1)
-        result.stdout.fnmatch_lines([
-            "*test_traceback_failure.py F", 
-            "====* FAILURES *====",
-            "____*____", 
-            "",
-            "    def test_onefails():",
-            ">       f(3)",
-            "",
-            "*test_*.py:6: ",
-            "_ _ _ *",
-            #"",
-            "    def f(x):",
-            ">       assert x == g()",
-            "E       assert 3 == 2",
-            "E        +  where 2 = g()",
-            "",
-            "*test_traceback_failure.py:4: AssertionError"
-        ])
-
-
     def test_showlocals(self, testdir): 
         p1 = testdir.makepyfile("""
             def test_showlocals():

py/test/pycollect.py

@@ -183,21 +183,13 @@ class Module(py.test.collect.File, PyCollectorMixin):
     def setup(self): 
         if getattr(self.obj, 'disabled', 0):
             py.test.skip("%r is disabled" %(self.obj,))
-        if not self.config.option.nomagic:
-            #print "*" * 20, "INVOKE assertion", self
-            py.magic.invoke(assertion=1)
         mod = self.obj
-        #self.config.pluginmanager.register(mod)
         if hasattr(mod, 'setup_module'): 
             self.obj.setup_module(mod)
 
     def teardown(self): 
         if hasattr(self.obj, 'teardown_module'): 
             self.obj.teardown_module(self.obj) 
-        if not self.config.option.nomagic:
-            #print "*" * 20, "revoke assertion", self
-            py.magic.revoke(assertion=1)
-        #self.config.pluginmanager.unregister(self.obj)
 
 class Class(PyCollectorMixin, py.test.collect.Collector): 
 

py/test/testing/test_pycollect.py

@@ -22,19 +22,6 @@ class TestModule:
         py.test.raises(SyntaxError, modcol.collect)
         py.test.raises(SyntaxError, modcol.run)
 
-    def test_module_assertion_setup(self, testdir, monkeypatch):
-        modcol = testdir.getmodulecol("pass")
-        from py.__.magic import assertion
-        l = []
-        monkeypatch.setattr(assertion, "invoke", lambda: l.append(None))
-        modcol.setup()
-        x = l.pop()
-        assert x is None
-        monkeypatch.setattr(assertion, "revoke", lambda: l.append(None))
-        modcol.teardown()
-        x = l.pop()
-        assert x is None
-
     def test_module_considers_pluginmanager_at_import(self, testdir):
         modcol = testdir.getmodulecol("pytest_plugins='xasdlkj',")
         py.test.raises(ImportError, "modcol.obj")