From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 27 Jan 2008 05:02:34 +0000 (+0000)
Subject: Try to prevent this test from being flaky.  We might need a sleep in here
X-Git-Tag: v2.6a1~379
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46c61b2c1dc082da1ab016e74c7074c3b653a358;p=thirdparty%2FPython%2Fcpython.git

Try to prevent this test from being flaky.  We might need a sleep in here
which isn't as bad as it sounds.  The close() *should* raise an exception,
so if it didn't we should give more time to sync and really raise it.

Will backport.
---

diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py
index 3ff31bb33dd5..f7c2976add41 100644
--- a/Lib/test/test_resource.py
+++ b/Lib/test/test_resource.py
@@ -54,8 +54,12 @@ class ResourceTest(unittest.TestCase):
                         f.write("Y")
                         f.flush()
                         # On some systems (e.g., Ubuntu on hppa) the flush()
-                        # doesn't cause the exception, but the close() does.
-                        f.close()
+                        # doesn't always cause the exception, but the close()
+                        # does eventually.  Try closing several times in
+                        # an attempt to ensure the file is really synced and
+                        # the exception raised.
+                        for i in range(5):
+                            f.close()
                     except IOError:
                         if not limit_set:
                             raise