X-Git-Url: http://www.git.cypherpunks.ru/?p=pyderasn.git;a=blobdiff_plain;f=tests%2Ftest_compli.py;fp=tests%2Ftest_compli.py;h=17c9b762d2d40d364ce4107ccdf50159bc1b549b;hp=9996d84a1472137c1ab9e15e331a3f0dfc32535b;hb=6ffa181faaed35d38e9057c473363b5b6e44efd6;hpb=eda9a545dda258ca202cb812633239eefeb2c5d6 diff --git a/tests/test_compli.py b/tests/test_compli.py index 9996d84..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,13 @@ 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) - with assertRaisesRegex(self, DecodeError, "too huge value"): + with self.assertRaisesRegex(DecodeError, "too huge value"): ObjectIdentifier().decode(data) def test_tc23(self): @@ -198,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): @@ -210,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): @@ -225,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): @@ -254,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): @@ -282,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})