[Python-checkins] r60343 - python/branches/release25-maint/Lib/test/test_resource.py

[neal.norwitz]

Author: neal.norwitz
Date: Sun Jan 27 06:02:56 2008
New Revision: 60343

Modified:
   python/branches/release25-maint/Lib/test/test_resource.py
Log:
Backport 60342:
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.


Modified: python/branches/release25-maint/Lib/test/test_resource.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_resource.py	(original)
+++ python/branches/release25-maint/Lib/test/test_resource.py	Sun Jan 27 06:02:56 2008
@@ -37,8 +37,11 @@
         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