X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=tests%2Ftest_compli.py;h=17c9b762d2d40d364ce4107ccdf50159bc1b549b;hb=HEAD;hp=8e0ff827480ca6e68404eb0f1f903f03f8b442e8;hpb=28b62f6a6edff52262d6488ebf09ce8b5a45961c;p=pyderasn.git

diff --git a/tests/test_compli.py b/tests/test_compli.py
index 8e0ff82..17c9b76 100644
--- a/tests/test_compli.py
+++ b/tests/test_compli.py
@@ -11,8 +11,6 @@ from os import path
 from unittest import skip
 from unittest import TestCase
 
-from six import assertRaisesRegex
-
 from pyderasn import BitString
 from pyderasn import Boolean
 from pyderasn import DecodeError
@@ -48,7 +46,7 @@ class TestTestSuite(TestCase):
 
     def test_tc2(self):
         data = load_tc(2)
-        with assertRaisesRegex(self, DecodeError, "unfinished tag"):
+        with self.assertRaisesRegex(DecodeError, "unfinished tag"):
             tag_strip(data)
 
     def test_tc3(self):
@@ -66,7 +64,7 @@ class TestTestSuite(TestCase):
     def test_tc5(self):
         data = load_tc(5)
         t, _, lv = tag_strip(data)
-        with assertRaisesRegex(self, DecodeError, "long form instead of"):
+        with self.assertRaisesRegex(DecodeError, "long form instead of"):
             len_decode(lv)
 
     @skip("PyDERASN does not support REAL")
@@ -119,7 +117,7 @@ class TestTestSuite(TestCase):
 
     def test_tc18(self):
         data = load_tc(18)
-        with assertRaisesRegex(self, DecodeError, "non normalized"):
+        with self.assertRaisesRegex(DecodeError, "non normalized"):
             Integer().decode(data)
 
     def test_tc19(self):
@@ -133,13 +131,14 @@ class TestTestSuite(TestCase):
 
     def test_tc21(self):
         data = load_tc(21)
-        with assertRaisesRegex(self, DecodeError, "non normalized"):
+        with self.assertRaisesRegex(DecodeError, "non normalized"):
             ObjectIdentifier().decode(data)
         ObjectIdentifier().decode(data, ctx={"bered": True})
 
     def test_tc22(self):
         data = load_tc(22)
-        ObjectIdentifier().decode(data)
+        with self.assertRaisesRegex(DecodeError, "too huge value"):
+            ObjectIdentifier().decode(data)
 
     def test_tc23(self):
         data = load_tc(23)
@@ -197,9 +196,9 @@ class TestTestSuite(TestCase):
 
     def test_tc33(self):
         data = load_tc(33)
-        with assertRaisesRegex(self, DecodeError, "too big pad"):
+        with self.assertRaisesRegex(DecodeError, "too big pad"):
             BitString().decode(data)
-        with assertRaisesRegex(self, DecodeError, "too big pad"):
+        with self.assertRaisesRegex(DecodeError, "too big pad"):
             BitString().decode(data, ctx={"bered": True})
 
     def test_tc34(self):
@@ -209,12 +208,12 @@ class TestTestSuite(TestCase):
 
     def test_tc35(self):
         data = load_tc(35)
-        with assertRaisesRegex(self, DecodeError, "expected BitString encoded chunk"):
+        with self.assertRaisesRegex(DecodeError, "expected BitString encoded chunk"):
             BitString().decode(data, ctx={"bered": True})
 
     def test_tc36(self):
         data = load_tc(36)
-        with assertRaisesRegex(self, DecodeError, "invalid pad"):
+        with self.assertRaisesRegex(DecodeError, "invalid pad"):
             BitString().decode(data, ctx={"bered": True})
 
     def test_tc37(self):
@@ -224,7 +223,7 @@ class TestTestSuite(TestCase):
         # of the last, shall contain a number of bits which is a
         # multiple of eight.
         data = load_tc(37)
-        with assertRaisesRegex(self, DecodeError, "invalid pad"):
+        with self.assertRaisesRegex(DecodeError, "invalid pad"):
             BitString().decode(data, ctx={"bered": True})
 
     def test_tc38(self):
@@ -253,7 +252,7 @@ class TestTestSuite(TestCase):
 
     def test_tc41(self):
         data = load_tc(41)
-        with assertRaisesRegex(self, DecodeError, "expected OctetString encoded chunk"):
+        with self.assertRaisesRegex(DecodeError, "expected OctetString encoded chunk"):
             OctetString().decode(data, ctx={"bered": True})
 
     def test_tc42(self):
@@ -281,10 +280,10 @@ class TestTestSuite(TestCase):
 
     def test_tc47(self):
         data = load_tc(47)
-        with assertRaisesRegex(self, DecodeError, "expected BitString encoded chunk"):
+        with self.assertRaisesRegex(DecodeError, "expected BitString encoded chunk"):
             BitString().decode(data, ctx={"bered": True})
 
     def test_tc48(self):
         data = load_tc(48)
-        with assertRaisesRegex(self, DecodeError, "too big pad"):
+        with self.assertRaisesRegex(DecodeError, "too big pad"):
             BitString().decode(data, ctx={"bered": True})