[pypy-commit] pypy default: merge the branch better-test-whatsnew: now you must document your branch in whatsnew-HEAD.rst BEFORE merging it

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r91391:b7531baf47cf
Date: 2017-05-23 14:42 +0200
http://bitbucket.org/pypy/pypy/changeset/b7531baf47cf/

Log:	merge the branch better-test-whatsnew: now you must document your
	branch in whatsnew-HEAD.rst BEFORE merging it

diff --git a/pypy/doc/test/test_whatsnew.py b/pypy/doc/test/test_whatsnew.py
--- a/pypy/doc/test/test_whatsnew.py
+++ b/pypy/doc/test/test_whatsnew.py
@@ -101,6 +101,8 @@
     assert not not_documented
     if branch == 'default':
         assert not not_merged
+    else:
+        assert branch in documented, 'Please document this branch before merging: %s' % branch
 
 def test_startrev_on_default():
     doc = ROOT.join('pypy', 'doc')
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -59,3 +59,5 @@
 .. branch: sockopt_zero
 
 Passing a buffersize of 0 to socket.getsockopt
+
+.. branch: better-test-whatsnew