aboutsummaryrefslogtreecommitdiff
path: root/tests/codec/ber/test_decoder.py
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-09-03 22:14:47 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-03 22:14:47 -0700
commit500c6a6bdbec796eeeafb112e558560e8f5168ee (patch)
tree33f05fcb02b39ce15aa202ac28ce3cbf9b405736 /tests/codec/ber/test_decoder.py
parent551643cee909fe7a139b82a33f967ba48dd362b2 (diff)
parent1fab31ffd71e359f32ce131865c90b4504b9fdaa (diff)
downloadpyasn1-500c6a6bdbec796eeeafb112e558560e8f5168ee.tar.gz
Upgrade python/pyasn1 to v0.4.7ndk-sysroot-r21
am: 1fab31ffd7 Change-Id: I231c58c0cdb60b8e7dcf9c017d247ee6f9f01c75
Diffstat (limited to 'tests/codec/ber/test_decoder.py')
-rw-r--r--tests/codec/ber/test_decoder.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/codec/ber/test_decoder.py b/tests/codec/ber/test_decoder.py
index 089f0f3..e3b74df 100644
--- a/tests/codec/ber/test_decoder.py
+++ b/tests/codec/ber/test_decoder.py
@@ -486,17 +486,17 @@ class RealDecoderTestCase(BaseTestCase):
if sys.version_info[0:2] > (2, 5):
class UniversalStringDecoderTestCase(BaseTestCase):
def testDecoder(self):
- assert decoder.decode(ints2octs((28, 12, 0, 0, 0, 97, 0, 0, 0, 98, 0, 0, 0, 99))) == (char.UniversalString(sys.version_info[0] == 3 and 'abc' or unicode('abc')), null)
+ assert decoder.decode(ints2octs((28, 12, 0, 0, 0, 97, 0, 0, 0, 98, 0, 0, 0, 99))) == (char.UniversalString(sys.version_info[0] >= 3 and 'abc' or unicode('abc')), null)
class BMPStringDecoderTestCase(BaseTestCase):
def testDecoder(self):
- assert decoder.decode(ints2octs((30, 6, 0, 97, 0, 98, 0, 99))) == (char.BMPString(sys.version_info[0] == 3 and 'abc' or unicode('abc')), null)
+ assert decoder.decode(ints2octs((30, 6, 0, 97, 0, 98, 0, 99))) == (char.BMPString(sys.version_info[0] >= 3 and 'abc' or unicode('abc')), null)
class UTF8StringDecoderTestCase(BaseTestCase):
def testDecoder(self):
- assert decoder.decode(ints2octs((12, 3, 97, 98, 99))) == (char.UTF8String(sys.version_info[0] == 3 and 'abc' or unicode('abc')), null)
+ assert decoder.decode(ints2octs((12, 3, 97, 98, 99))) == (char.UTF8String(sys.version_info[0] >= 3 and 'abc' or unicode('abc')), null)
class SequenceOfDecoderTestCase(BaseTestCase):