[WIP] Use `unittest` assert methods

Changed assertion in unit tests from Python built-in
to `unittest` provided. The motivation is to have better
reporting on test failures.

CHANGES.rst

@@ -22,6 +22,9 @@
   `StreamingDecoder` class. Previously published API is implemented
   as a thin wrapper on top of that ensuring backward compatibility.
 
+- Changed assertion in unit tests from Python built-in to `unittest`
+  provided
+
 Revision 0.4.9, released XX-11-2019
 -----------------------------------
 

tests/codec/test_streaming.py

@@ -6,10 +6,5 @@
 #
 import io
 import sys
-
-try:
-    import unittest2 as unittest
-
-except ImportError:
 import unittest
 
@@ -14,4 +9,5 @@
 import unittest
 
+from pyasn1.codec import streaming
 from tests.base import BaseTestCase
 
@@ -16,7 +12,5 @@
 from tests.base import BaseTestCase
 
-from pyasn1.codec import streaming
-
 
 class CachingStreamWrapperTestCase(BaseTestCase):
     def setUp(self):
@@ -29,11 +23,12 @@
         wrapper = streaming.CachingStreamWrapper(self.shortStream)
         wrapper.read(6)
         wrapper.seek(3)
-        assert wrapper.read(1) == b"d"
-        assert wrapper.read(1) == b"e"
-        assert wrapper.tell() == 5
+
+        self.assertEqual(b'd', wrapper.read(1))
+        self.assertEqual(b'e', wrapper.read(1))
+        self.assertEqual(5, wrapper.tell())
 
     def testReadFromCacheAndStream(self):
         wrapper = streaming.CachingStreamWrapper(self.shortStream)
         wrapper.read(6)
         wrapper.seek(3)
@@ -35,10 +30,11 @@
 
     def testReadFromCacheAndStream(self):
         wrapper = streaming.CachingStreamWrapper(self.shortStream)
         wrapper.read(6)
         wrapper.seek(3)
-        assert wrapper.read(4) == b"defg"
-        assert wrapper.tell() == 7
+
+        self.assertEqual(b'defg', wrapper.read(4))
+        self.assertEqual(7, wrapper.tell())
 
     def testReadJustFromStream(self):
         wrapper = streaming.CachingStreamWrapper(self.shortStream)
@@ -42,9 +38,10 @@
 
     def testReadJustFromStream(self):
         wrapper = streaming.CachingStreamWrapper(self.shortStream)
-        assert wrapper.read(6) == b"abcdef"
-        assert wrapper.tell() == 6
+
+        self.assertEqual(b'abcdef', wrapper.read(6))
+        self.assertEqual(6, wrapper.tell())
 
     def testPeek(self):
         wrapper = streaming.CachingStreamWrapper(self.longStream)
         read_bytes = wrapper.peek(io.DEFAULT_BUFFER_SIZE + 73)
@@ -47,13 +44,14 @@
 
     def testPeek(self):
         wrapper = streaming.CachingStreamWrapper(self.longStream)
         read_bytes = wrapper.peek(io.DEFAULT_BUFFER_SIZE + 73)
-        assert len(read_bytes) == io.DEFAULT_BUFFER_SIZE + 73
-        assert read_bytes.startswith(b"abcdefg")
-        assert wrapper.tell() == 0
-        assert wrapper.read(4) == b"abcd"
+
+        self.assertEqual(io.DEFAULT_BUFFER_SIZE + 73, len(read_bytes))
+        self.assertTrue(read_bytes.startswith(b'abcdefg'))
+        self.assertEqual(0, wrapper.tell())
+        self.assertEqual(b'abcd', wrapper.read(4))
 
     def testMarkedPositionResets(self):
         wrapper = streaming.CachingStreamWrapper(self.longStream)
         wrapper.read(10)
         wrapper.markedPosition = wrapper.tell()
@@ -55,9 +53,10 @@
 
     def testMarkedPositionResets(self):
         wrapper = streaming.CachingStreamWrapper(self.longStream)
         wrapper.read(10)
         wrapper.markedPosition = wrapper.tell()
-        assert wrapper.markedPosition == 10
+
+        self.assertEqual(10, wrapper.markedPosition)
 
         # Reach the maximum capacity of cache
         wrapper.read(io.DEFAULT_BUFFER_SIZE)
@@ -61,7 +60,8 @@
 
         # Reach the maximum capacity of cache
         wrapper.read(io.DEFAULT_BUFFER_SIZE)
-        assert wrapper.tell() == 10 + io.DEFAULT_BUFFER_SIZE
+
+        self.assertEqual(10 + io.DEFAULT_BUFFER_SIZE, wrapper.tell())
 
         # The following should clear the cache
         wrapper.markedPosition = wrapper.tell()
@@ -65,8 +65,9 @@
 
         # The following should clear the cache
         wrapper.markedPosition = wrapper.tell()
-        assert wrapper.markedPosition == 0
-        assert len(wrapper._cache.getvalue()) == 0
+
+        self.assertEqual(0, wrapper.markedPosition)
+        self.assertEqual(0, len(wrapper._cache.getvalue()))
 
 
 suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])

tests/test_debug.py

@@ -7,5 +7,7 @@
 import sys
 import unittest
 
+from pyasn1 import debug
+from pyasn1 import error
 from tests.base import BaseTestCase
 
@@ -10,7 +12,5 @@
 from tests.base import BaseTestCase
 
-from pyasn1 import debug
-from pyasn1 import error
 
 class DebugCaseBase(BaseTestCase):
     def testKnownFlags(self):
@@ -19,16 +19,8 @@
         debug.setLogger(0)
 
     def testUnknownFlags(self):
-        try:
-            debug.setLogger(debug.Debug('all', 'unknown', loggerName='xxx'))
-
-        except error.PyAsn1Error:
-            debug.setLogger(0)
-            return
-
-        else:
-            debug.setLogger(0)
-            assert 0, 'unknown debug flag tolerated'
+        self.assertRaises(
+            error.PyAsn1Error, debug.Debug, 'all', 'unknown', loggerName='xxx')
 
 
 suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])