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

Merge branch 'issue121' into devel

Browse source
This commit is contained in:
John Evans 2013-09-23 16:09:29 -04:00
commit 7c30fe6a52
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
glymur/test/test_jp2box.py
View file

@ -57,6 +57,9 @@ def load_tests(loader, tests, ignore):
return tests return tests
@unittest.skipIf(glymur.version.openjpeg_version_tuple[0] > 1 and
OPENJP2_IS_V2_OFFICIAL,
"Not supported until 2.0+.")
@unittest.skipIf(os.name == "nt", "Temporary file issue on window.") @unittest.skipIf(os.name == "nt", "Temporary file issue on window.")
class TestChannelDefinition(unittest.TestCase): class TestChannelDefinition(unittest.TestCase):
"""Test suite for channel definition boxes.""" """Test suite for channel definition boxes."""

5
glymur/test/test_jp2k.py
View file

@ -117,7 +117,8 @@ class TestJp2kBadXmlFile(unittest.TestCase):
self.assertIsNone(jp2k.box[3].xml) self.assertIsNone(jp2k.box[3].xml)
@unittest.skipIf(glymur.lib.openjp2.OPENJP2 is None and not OPENJP2_IS_V2_OFFICIAL, @unittest.skipIf(glymur.version.openjpeg_version_tuple[0] > 1 and
OPENJP2_IS_V2_OFFICIAL,
"Missing openjp2 library version 2.0+.") "Missing openjp2 library version 2.0+.")
class TestJp2k_2_1(unittest.TestCase): class TestJp2k_2_1(unittest.TestCase):
"""Test suite for version 2.0+ of openjpeg software""" """Test suite for version 2.0+ of openjpeg software"""
@ -201,7 +202,7 @@ class TestJp2k_2_0(unittest.TestCase):
def tearDown(self): def tearDown(self):
pass pass
@unittest.skipIf(not OPENJP2_IS_V2_OFFICIAL, @unittest.skipIf(OPENJP2_IS_V2_OFFICIAL,
"Behavior is specific to 2.0 official.") "Behavior is specific to 2.0 official.")
@unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows")
def test_extra_components_on_v2(self): def test_extra_components_on_v2(self):

4
glymur/test/test_opj_suite.py
View file

@ -6724,6 +6724,8 @@ class TestSuiteDump(unittest.TestCase):
[8, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10]) [8, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10])
@unittest.skipIf(OPJ_DATA_ROOT is None,
"OPJ_DATA_ROOT environment variable not set")
@unittest.skipIf(glymur.version.openjpeg_version_tuple[0] == 1, @unittest.skipIf(glymur.version.openjpeg_version_tuple[0] == 1,
"Feature not supported in glymur until openjpeg 2.0") "Feature not supported in glymur until openjpeg 2.0")
class TestSuite_bands(unittest.TestCase): class TestSuite_bands(unittest.TestCase):
@ -6853,6 +6855,8 @@ class TestSuite_bands(unittest.TestCase):
self.assertTrue(True) self.assertTrue(True)
@unittest.skipIf(OPJ_DATA_ROOT is None,
"OPJ_DATA_ROOT environment variable not set")
@unittest.skipIf(glymur.version.openjpeg_version_tuple[0] == 1, @unittest.skipIf(glymur.version.openjpeg_version_tuple[0] == 1,
"Tests not passing until 2.0") "Tests not passing until 2.0")
class TestSuite2point0(unittest.TestCase): class TestSuite2point0(unittest.TestCase):