summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-10-12 01:41:49 +0200
committerChristian Heimes <christian@cheimes.de>2013-10-12 01:41:49 +0200
commitcbf6e95de5ef9f38c4eac074488884dc80dcc6de (patch)
tree601ca47b6e5ef59d2857ef4e5106a2f8fb5ffeb3
parentc1df2729ea3e11e9111a359ee82e2735289b14ad (diff)
parent370cb253071b4f5d1486114cdda1a95ef0b6d9bb (diff)
downloadcpython-git-cbf6e95de5ef9f38c4eac074488884dc80dcc6de.tar.gz
merge
-rw-r--r--Lib/test/test_os.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index ab44d011e5..f1d652c9a5 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -281,7 +281,7 @@ class StatAttributeTests(unittest.TestCase):
except OSError as e:
# On AtheOS, glibc always returns ENOSYS
if e.errno == errno.ENOSYS:
- return
+ self.skipTest('os.statvfs() failed with ENOSYS')
# Make sure direct access works
self.assertEqual(result.f_bfree, result[3])
@@ -326,7 +326,8 @@ class StatAttributeTests(unittest.TestCase):
except OSError as e:
# On AtheOS, glibc always returns ENOSYS
if e.errno == errno.ENOSYS:
- return
+ self.skipTest('os.statvfs() failed with ENOSYS')
+
p = pickle.dumps(result)
self.assertIn(b'\x03cos\nstatvfs_result\n', p)
unpickled = pickle.loads(p)