[py-svn] commit/pytest: 2 new changesets

[Bitbucket]

2 new changesets in pytest:

http://bitbucket.org/hpk42/pytest/changeset/d5f8ea5f9443/
changeset:   d5f8ea5f9443
user:        hpk42
date:        2011-07-09 13:48:55
summary:     add experimental "+1" button
affected #:  2 files (162 bytes)

--- a/doc/_templates/layout.html	Sat Jul 09 13:23:58 2011 +0200
+++ b/doc/_templates/layout.html	Sat Jul 09 13:48:55 2011 +0200
@@ -1,5 +1,9 @@
 {% extends "!layout.html" %}
 
+{% block relbaritems %}
+{{ super() }}
+<g:plusone></g:plusone>
+{% endblock %}
 
 {% block footer %}
 {{ super() }}
@@ -16,4 +20,5 @@
   })();
 
 </script>
+<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
 {% endblock %}


--- a/doc/_templates/localtoc.html	Sat Jul 09 13:23:58 2011 +0200
+++ b/doc/_templates/localtoc.html	Sat Jul 09 13:48:55 2011 +0200
@@ -18,7 +18,7 @@
 <td><a href="{{ pathto('index') }}">home</a></td><td>
-        <a href="{{ pathto('contents') }}">TOC contents</a>
+        <a href="{{ pathto('contents') }}">TOC/contents</a></td></tr><tr><td><a href="{{ pathto('getting-started') }}">install</a></td><td>


http://bitbucket.org/hpk42/pytest/changeset/6f3f84d5e5b7/
changeset:   6f3f84d5e5b7
user:        hpk42
date:        2011-07-12 17:21:48
summary:     merge heads
affected #:  9 files (616 bytes)

--- a/CHANGELOG	Sat Jul 09 13:48:55 2011 +0200
+++ b/CHANGELOG	Tue Jul 12 17:21:48 2011 +0200
@@ -1,3 +1,8 @@
+Changes between 2.1.0 and 2.1.1.DEV
+----------------------------------------------
+
+- XXX
+
 Changes between 2.0.3 and 2.1.0.DEV
 ----------------------------------------------
 


--- a/_pytest/__init__.py	Sat Jul 09 13:48:55 2011 +0200
+++ b/_pytest/__init__.py	Tue Jul 12 17:21:48 2011 +0200
@@ -1,2 +1,2 @@
 #
-__version__ = '2.1.0'
+__version__ = '2.1.1.dev1'


--- a/_pytest/assertion/newinterpret.py	Sat Jul 09 13:48:55 2011 +0200
+++ b/_pytest/assertion/newinterpret.py	Tue Jul 12 17:21:48 2011 +0200
@@ -53,7 +53,7 @@
     if should_fail:
         return ("(assertion failed, but when it was re-run for "
                 "printing intermediate values, it did not fail.  Suggestions: "
-                "compute assert expression before the assert or use --no-assert)")
+                "compute assert expression before the assert or use --assert=plain)")
 
 def run(offending_line, frame=None):
     if frame is None:


--- a/_pytest/assertion/oldinterpret.py	Sat Jul 09 13:48:55 2011 +0200
+++ b/_pytest/assertion/oldinterpret.py	Tue Jul 12 17:21:48 2011 +0200
@@ -482,7 +482,7 @@
     if should_fail:
         return ("(assertion failed, but when it was re-run for "
                 "printing intermediate values, it did not fail.  Suggestions: "
-                "compute assert expression before the assert or use --nomagic)")
+                "compute assert expression before the assert or use --assert=plain)")
     else:
         return None
 


--- a/_pytest/assertion/rewrite.py	Sat Jul 09 13:48:55 2011 +0200
+++ b/_pytest/assertion/rewrite.py	Tue Jul 12 17:21:48 2011 +0200
@@ -421,7 +421,7 @@
             if chain:
                 where = []
                 if len(chain) > 1:
-                    cond = ast.Boolop(ast.And(), chain)
+                    cond = ast.BoolOp(ast.And(), list(chain))
                 else:
                     cond = chain[0]
                 self.statements.append(ast.If(cond, where, []))


--- a/doc/assert.txt	Sat Jul 09 13:48:55 2011 +0200
+++ b/doc/assert.txt	Tue Jul 12 17:21:48 2011 +0200
@@ -240,6 +240,8 @@
 
 All assert introspection can be turned off by passing ``--assert=plain``.
 
+For further information, Benjamin Peterson wrote up `Behind the scenes of py.test's new assertion rewriting <http://pybites.blogspot.com/2011/07/behind-scenes-of-pytests-new-assertion.html>`_.
+
 .. versionadded:: 2.1
    Add assert rewriting as an alternate introspection technique.
 


--- a/doc/talks.txt	Sat Jul 09 13:48:55 2011 +0200
+++ b/doc/talks.txt	Tue Jul 12 17:21:48 2011 +0200
@@ -28,6 +28,11 @@
 - `parametrizing tests, generalized`_ (blog post)
 - `putting test-hooks into local or global plugins`_ (blog post)
 
+assertion introspection
+
+- `(07/2011) Behind the scenes of py.test's new assertion rewriting
+  <http://pybites.blogspot.com/2011/07/behind-scenes-of-pytests-new-assertion.html>`_ 
+
 distributed testing:
 
 - `simultaneously test your code on all platforms`_ (blog entry)


--- a/setup.py	Sat Jul 09 13:48:55 2011 +0200
+++ b/setup.py	Tue Jul 12 17:21:48 2011 +0200
@@ -24,7 +24,7 @@
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.1.0',
+        version='2.1.1.dev1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@@ -70,4 +70,4 @@
     return {'console_scripts': l}
 
 if __name__ == '__main__':
-    main()
+    main()
\ No newline at end of file


--- a/testing/test_assertrewrite.py	Sat Jul 09 13:48:55 2011 +0200
+++ b/testing/test_assertrewrite.py	Tue Jul 12 17:21:48 2011 +0200
@@ -137,6 +137,10 @@
             g = False
             assert f or g
         getmsg(f, must_pass=True)
+        def f():
+            f = g = h = lambda: True
+            assert f() and g() and h()
+        getmsg(f, must_pass=True)
 
     def test_short_circut_evaluation(self):
         def f():

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.