[pypy-commit] pypy default: merged upstream

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r73187:74f177d4a019
Date: 2014-08-29 11:23 -0700
http://bitbucket.org/pypy/pypy/changeset/74f177d4a019/

Log:	merged upstream

diff --git a/rpython/rlib/test/test_rfile.py b/rpython/rlib/test/test_rfile.py
--- a/rpython/rlib/test/test_rfile.py
+++ b/rpython/rlib/test/test_rfile.py
@@ -16,6 +16,13 @@
             f = open(fname, "w")
             f.write("dupa")
             f.close()
+            try:
+                f.write("dupb")
+            except ValueError:
+                pass
+            else:
+                assert False
+            f.close()
 
         f()
         self.interpret(f, [])