Use pytest.importorskip; fix some other tests.

Author: habnabit

examples/test_iso8601.py

@@ -1,19 +1,13 @@
 import datetime
 import unittest
 
-try:
-    import pytz
-    from iso8601 import DateTimeParser
-except ImportError:
-    skip = 'pytz is not installed or usable'
-else:
-    skip = None
+import pytest
 
+pytz = pytest.importorskip('pytz')
+from iso8601 import DateTimeParser
 
-class TestDatetimeParsing(unittest.TestCase):
-    if skip is not None:
-        skip = skip
 
+class TestDatetimeParsing(unittest.TestCase):
     def test_date(self):
         self.assertEqual(
             datetime.date(2001, 12, 25),

ometa/test/test_protocol.py

@@ -1,16 +1,14 @@
-try:
-    from twisted.trial import unittest
-    from ometa.protocol import ParserProtocol
-except ImportError:
-    import unittest
-    skip = "twisted not installed or usable"
-else:
-    skip = None
+import unittest
+
+import pytest
 
 from ometa.grammar import OMeta
 from ometa.runtime import ParseError
 
 
+protocol = pytest.importorskip('ometa.protocol')
+ParserProtocol = protocol.ParserProtocol
+
 testingGrammarSource = """
 
 someA = ('a' 'a') -> receiver('a')
@@ -69,11 +67,7 @@ def abortConnection(self):
 
 
 class ParserProtocolTestCase(unittest.TestCase):
-    skip = skip
-
     def setUp(self):
-        if skip is not None:
-            raise unittest.SkipTest(skip)
         self.protocol = ParserProtocol(
             testGrammar, SenderFactory, ReceiverFactory, {})
 
@@ -168,8 +162,8 @@ def test_parseFailure(self):
         self.protocol.makeConnection(transport)
         self.protocol.dataReceived('b')
         self.failIfEqual(self.protocol.receiver.lossReason, None)
-        self.failUnlessIsInstance(self.protocol.receiver.lossReason.value,
-                                  ParseError)
+        self.assertTrue(
+            isinstance(self.protocol.receiver.lossReason.value, ParseError))
         self.assert_(transport.aborted)
 
     def test_exceptionsRaisedFromReceiver(self):
@@ -181,8 +175,8 @@ def test_exceptionsRaisedFromReceiver(self):
         self.protocol.makeConnection(transport)
         self.protocol.dataReceived('e')
         self.failIfEqual(self.protocol.receiver.lossReason, None)
-        self.failUnlessIsInstance(self.protocol.receiver.lossReason.value,
-                                  SomeException)
+        self.assertTrue(
+            isinstance(self.protocol.receiver.lossReason.value, SomeException))
         self.assert_(transport.aborted)
 
     def test_dataIgnoredAfterDisconnection(self):