[Jython-checkins] jython (merge default -> default): merge.

[frank.wierzbicki]

http://hg.python.org/jython/rev/bfb99e7c29be
changeset:   6719:bfb99e7c29be
parent:      6718:c423e9a313ce
parent:      6717:dce92eb76fe9
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Jun 18 13:31:34 2012 -0700
summary:
  merge.

files:
  Lib/test/test_io.py |  14 +++++++++++---
  1 files changed, 11 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -390,9 +390,17 @@
         # On Windows and Mac OSX this test comsumes large resources; It takes
         # a long time to build the >2GB file and takes >2GB of disk space
         # therefore the resource must be enabled to run this test.
-        if sys.platform[:3] == 'win' or sys.platform == 'darwin':
-            if not support.is_resource_enabled("largefile"):
-                print("\nTesting large file ops skipped on %s." % sys.platform,
+        if not support.is_resource_enabled("largefile"):
+            skip_platform = None
+            # Cases in which to skip this test
+            if sys.platform[:3] == 'win' or sys.platform == 'darwin':
+                skip_platform = sys.platform;
+            elif sys.platform[:4] == "java":
+                # Jython cases in which to skip this test
+                if os._name == "nt":
+                    skip_platform = 'Jython + ' + os._name;
+            if skip_platform:
+                print("\nTesting large file ops skipped on %s." % skip_platform,
                       file=sys.stderr)
                 print("It requires %d bytes and a long time." % self.LARGE,
                       file=sys.stderr)

-- 
Repository URL: http://hg.python.org/jython