Requalified on 1.3. #121

This commit is contained in:
John Evans 2013-09-23 16:22:49 -04:00
commit e20cf07a8a
3 changed files with 5 additions and 4 deletions

View file

@ -57,7 +57,7 @@ def load_tests(loader, tests, ignore):
return tests return tests
@unittest.skipIf(glymur.version.openjpeg_version_tuple[0] > 1 and @unittest.skipIf(glymur.version.openjpeg_version_tuple[0] < 2 or
OPENJP2_IS_V2_OFFICIAL, OPENJP2_IS_V2_OFFICIAL,
"Not supported until 2.0+.") "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.")

View file

@ -117,7 +117,7 @@ class TestJp2kBadXmlFile(unittest.TestCase):
self.assertIsNone(jp2k.box[3].xml) self.assertIsNone(jp2k.box[3].xml)
@unittest.skipIf(glymur.version.openjpeg_version_tuple[0] > 1 and @unittest.skipIf(glymur.version.openjpeg_version_tuple[0] < 2 or
OPENJP2_IS_V2_OFFICIAL, 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):

View file

@ -10,6 +10,7 @@
# pylint: disable=R0904 # pylint: disable=R0904
import os import os
import re
import struct import struct
import sys import sys
import tempfile import tempfile
@ -36,8 +37,8 @@ from .fixtures import OPJ_DATA_ROOT, opj_data_file
@unittest.skipIf(os.name == "nt", "Temporary file issue on window.") @unittest.skipIf(os.name == "nt", "Temporary file issue on window.")
@unittest.skipIf(glymur.version.openjpeg_version_tuple[0] == 0, @unittest.skipIf(re.match(r"""1\.[01234]""", glymur.version.openjpeg_version),
"Missing library.") "Need at least 1.5 in order to write jp2 files.")
class TestPrintingNeedsLib(unittest.TestCase): class TestPrintingNeedsLib(unittest.TestCase):
"""These tests require the library, mostly in order to just setup the test. """These tests require the library, mostly in order to just setup the test.
""" """