From f0dfe39932ab10e522cec8f787a1da72afe4ac2d Mon Sep 17 00:00:00 2001 From: John Evans Date: Sun, 14 Jul 2013 07:32:54 -0400 Subject: [PATCH 1/2] TestSuite15.test_ETS_JP2_file9 now appropriate for 1.3 --- glymur/test/test_opj_suite.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/glymur/test/test_opj_suite.py b/glymur/test/test_opj_suite.py index 9502901..87c3c88 100644 --- a/glymur/test/test_opj_suite.py +++ b/glymur/test/test_opj_suite.py @@ -7765,13 +7765,14 @@ class TestSuite15(unittest.TestCase): jpdata = jp2k.read() self.assertEqual(jpdata.shape, (400, 700)) - @unittest.skipIf(glymur.lib.openjpeg.version().startswith('1.3'), - "Version 1.3 reads palette images wrong.") def test_ETS_JP2_file9(self): jfile = os.path.join(data_root, 'input/conformance/file9.jp2') jp2k = Jp2k(jfile) jpdata = jp2k.read() - self.assertEqual(jpdata.shape, (512, 768, 3)) + if glymur.lib.openjpeg.version().startswith('1.3'): + self.assertEqual(jpdata.shape, (512, 768)) + else: + self.assertEqual(jpdata.shape, (512, 768, 3)) def test_NR_DEC_Bretagne2_j2k_1_decode(self): jfile = os.path.join(data_root, From 643f956e0cf25ff977a279ad4514024f9e5d94df Mon Sep 17 00:00:00 2001 From: John Evans Date: Sun, 14 Jul 2013 07:33:43 -0400 Subject: [PATCH 2/2] test discovery for glymur.runtests fixed on python2.6 --- glymur/__init__.py | 5 ++++- release.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glymur/__init__.py b/glymur/__init__.py index c720c16..b89dd20 100644 --- a/glymur/__init__.py +++ b/glymur/__init__.py @@ -11,6 +11,9 @@ from . import test def runtests(): """Discover and run all tests for the glymur package. """ - import unittest + if sys.hexversion <= 0x02070000: + import unittest2 as unittest + else: + import unittest suite = unittest.defaultTestLoader.discover(__path__[0]) unittest.TextTestRunner(verbosity=2).run(suite) diff --git a/release.txt b/release.txt index e46d85a..baecd5e 100644 --- a/release.txt +++ b/release.txt @@ -25,7 +25,7 @@ | Fedora | | X | | Ships with 1.4.0. 167 of 445 tests | | 17 | | | | should pass. | +---------+--------+--------+--------+---------------------------------------+ -| CentOS | X | | | Ships with 1.3.0. 166 of 445 tests | +| CentOS | X | | | Ships with 1.3.0. 165 of 445 tests | | 6.3 | | | | should pass. | +---------+--------+--------+--------+---------------------------------------+