From cd8efa3704bc1aec1338fdc8fc0cfe8ee5bc100e Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Wed, 14 Nov 2012 15:16:53 -0500
Subject: Clean up the messages used by some tests.

---
 Lib/test/test_devpoll.py |  2 +-
 Lib/test/test_openpty.py |  2 +-
 Lib/test/test_poll.py    |  2 +-
 Lib/test/test_wait3.py   | 12 ++++--------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py
index bef4e18..ec350cd 100644
--- a/Lib/test/test_devpoll.py
+++ b/Lib/test/test_devpoll.py
@@ -8,7 +8,7 @@ from test.support import TESTFN, run_unittest
 try:
     select.devpoll
 except AttributeError:
-    raise unittest.SkipTest("select.devpoll not defined -- skipping test_devpoll")
+    raise unittest.SkipTest("select.devpoll not defined")
 
 
 def find_ready_matching(ready, flag):
diff --git a/Lib/test/test_openpty.py b/Lib/test/test_openpty.py
index e8175ff..8713d34 100644
--- a/Lib/test/test_openpty.py
+++ b/Lib/test/test_openpty.py
@@ -4,7 +4,7 @@ import os, unittest
 from test.support import run_unittest
 
 if not hasattr(os, "openpty"):
-    raise unittest.SkipTest("No openpty() available.")
+    raise unittest.SkipTest("os.openpty() not available.")
 
 
 class OpenptyTest(unittest.TestCase):
diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 7ab3b84..720cff3 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -6,7 +6,7 @@ from test.support import TESTFN, run_unittest
 try:
     select.poll
 except AttributeError:
-    raise unittest.SkipTest("select.poll not defined -- skipping test_poll")
+    raise unittest.SkipTest("select.poll not defined")
 
 
 def find_ready_matching(ready, flag):
diff --git a/Lib/test/test_wait3.py b/Lib/test/test_wait3.py
index bd06c8d..3d70ced 100644
--- a/Lib/test/test_wait3.py
+++ b/Lib/test/test_wait3.py
@@ -7,15 +7,11 @@ import unittest
 from test.fork_wait import ForkWait
 from test.support import run_unittest, reap_children
 
-try:
-    os.fork
-except AttributeError:
-    raise unittest.SkipTest("os.fork not defined -- skipping test_wait3")
+if not hassattr(os, 'fork'):
+    raise unittest.SkipTest("os.fork not defined")
 
-try:
-    os.wait3
-except AttributeError:
-    raise unittest.SkipTest("os.wait3 not defined -- skipping test_wait3")
+if not hasattr(os, 'wait3'):
+    raise unittest.SkipTest("os.wait3 not defined")
 
 class Wait3Test(ForkWait):
     def wait_impl(self, cpid):
-- 
cgit v0.12