jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'issue266' into devel

Browse source
This commit is contained in:
jevans 2014-09-24 21:48:21 -04:00
commit 64fa597b18
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
glymur/test/test_jp2k.py
View file

@ -19,6 +19,7 @@ import sys
import tempfile import tempfile
import unittest import unittest
import uuid import uuid
import warnings
from xml.etree import cElementTree as ET from xml.etree import cElementTree as ET
import numpy as np import numpy as np
@ -1104,7 +1105,8 @@ class TestJp2k_2_1(unittest.TestCase):
tfile.write(data[offset+59:]) tfile.write(data[offset+59:])
#tfile.write(data[3186:]) #tfile.write(data[3186:])
tfile.flush() tfile.flush()
with self.assertWarns(UserWarning): with warnings.catch_warnings():
warnings.simplefilter('ignore')
j = Jp2k(tfile.name) j = Jp2k(tfile.name)
regexp = re.compile(r'''OpenJPEG\slibrary\serror:\s+ regexp = re.compile(r'''OpenJPEG\slibrary\serror:\s+
Invalid\svalues\sfor\scomp\s=\s0\s+ Invalid\svalues\sfor\scomp\s=\s0\s+
@ -1126,7 +1128,7 @@ class TestParsing(unittest.TestCase):
glymur.set_parseoptions(codestream=True) glymur.set_parseoptions(codestream=True)
def tearDown(self): def tearDown(self):
pass glymur.set_parseoptions(codestream=True)
@unittest.skipIf(WARNING_INFRASTRUCTURE_ISSUE, WARNING_INFRASTRUCTURE_MSG) @unittest.skipIf(WARNING_INFRASTRUCTURE_ISSUE, WARNING_INFRASTRUCTURE_MSG)
def test_bad_rsiz(self): def test_bad_rsiz(self):
@ -1139,6 +1141,7 @@ class TestParsing(unittest.TestCase):
with self.assertWarnsRegex(UserWarning, 'Invalid profile'): with self.assertWarnsRegex(UserWarning, 'Invalid profile'):
jp2 = Jp2k(filename) jp2 = Jp2k(filename)
#@unittest.skip('trouble is a brewing...')
def test_main_header(self): def test_main_header(self):
"""Verify that the main header is not loaded when parsing turned off.""" """Verify that the main header is not loaded when parsing turned off."""
# The hidden _main_header attribute should show up after accessing it. # The hidden _main_header attribute should show up after accessing it.

2
glymur/test/test_opj_suite_dump.py
View file

@ -2851,7 +2851,6 @@ class TestSuiteWarns(MetadataBase):
d = j.read() d = j.read()
self.assertTrue(True) self.assertTrue(True)
@unittest.skip("unexplained failure")
def test_NR_broken4_jp2_dump(self): def test_NR_broken4_jp2_dump(self):
jfile = opj_data_file('input/nonregression/broken4.jp2') jfile = opj_data_file('input/nonregression/broken4.jp2')
with self.assertWarns(UserWarning): with self.assertWarns(UserWarning):
@ -2944,7 +2943,6 @@ class TestSuiteWarns(MetadataBase):
self.assertEqual(c.segment[6].exponent, self.assertEqual(c.segment[6].exponent,
[8] + [9, 9, 10] * 5) [8] + [9, 9, 10] * 5)
@unittest.skip("unexplained failure")
def test_NR_broken2_jp2_dump(self): def test_NR_broken2_jp2_dump(self):
""" """
Invalid marker ID in the codestream. Invalid marker ID in the codestream.

1
glymur/test/test_printing.py
View file

@ -854,7 +854,6 @@ class TestPrintingOpjDataRootWarns(unittest.TestCase):
with patch('sys.stdout', new=StringIO()) as fake_out: with patch('sys.stdout', new=StringIO()) as fake_out:
print(jp2) print(jp2)
@unittest.skip("unexplained failure")
def test_bad_rsiz(self): def test_bad_rsiz(self):
"""Should still be able to print if rsiz is bad, issue196""" """Should still be able to print if rsiz is bad, issue196"""
filename = opj_data_file('input/nonregression/edf_c2_1002767.jp2') filename = opj_data_file('input/nonregression/edf_c2_1002767.jp2')