add python 2.6 to Travis (#266)

* add python 2.6 to Travis

* update some assert statements to be compatible with python2.6

* test Exception messages in a different way, since assertRaisesRegexp was added in 2.7

Author: bcail

.travis.yml

@@ -17,6 +17,7 @@ addons:
 language: python
 
 python:
+ - "2.6"
  - "2.7"
 
 # before_install:

tests/abstract_resolver.py

@@ -21,8 +21,8 @@ def test_format(self):
     def test_resolve(self):
         expected_resolved = (self.expected_filepath, self.expected_format)
         resolved = self.resolver.resolve(self.identifier)
-        self.assertSequenceEqual(resolved, expected_resolved)
+        self.assertEqual(resolved[0], expected_resolved[0])
+        self.assertEqual(resolved[1], expected_resolved[1])
 
     def test_resolve_exception(self):
-        with self.assertRaises(loris_exception.ResolverException):
-            self.resolver.resolve(self.not_identifier)
+        self.assertRaises(loris_exception.ResolverException, lambda: self.resolver.resolve(self.not_identifier))

tests/img_info_t.py

@@ -135,22 +135,25 @@ def test_info_from_jpg_marked_as_jp2(self):
         ident = '01%2f03%2f0001.jpg'
         uri = '%s/%s' % (self.URI_BASE, ident)
         formats = [ "jpg", "png", "gif", "webp" ]
-        exception = loris_exception.ImageInfoException
-        function = img_info.ImageInfo.from_image_file
-        args = [uri, fp, fmt, formats]
-        self.assertRaisesRegexp(exception, '^Invalid JP2 file$', function, *args)
+        #see http://stackoverflow.com/a/8673096
+        try:
+            img_info.ImageInfo.from_image_file(uri, fp, fmt, formats)
+            self.fail('should have thrown an ImageInfoException')
+        except loris_exception.ImageInfoException as iie:
+            self.assertEqual(iie.message, 'Invalid JP2 file')
 
     def test_info_from_invalid_src_format(self):
         fp = path.join(self.test_img_dir, '01', '03', '0001.jpg')
         fmt = 'invalid_format'
         ident = '01%2f03%2f0001.jpg'
         uri = '%s/%s' % (self.URI_BASE, ident)
         formats = [ "jpg", "png", "gif", "webp" ]
-        exception = loris_exception.ImageInfoException
-        error_message = 'Didn\'t get a source format, or at least one we recognize \("invalid_format"\)'
-        function = img_info.ImageInfo.from_image_file
-        args = [uri, fp, fmt, formats]
-        self.assertRaisesRegexp(exception, error_message, function, *args)
+        error_message = 'Didn\'t get a source format, or at least one we recognize ("invalid_format")'
+        try:
+            img_info.ImageInfo.from_image_file(uri, fp, fmt, formats)
+            self.fail('should have thrown an ImageInfoException')
+        except loris_exception.ImageInfoException as iie:
+            self.assertEqual(iie.message, error_message)
 
     def test_jpeg_info_from_image(self):
         fp = self.test_jpeg_fp

tests/resolver_t.py

@@ -237,13 +237,13 @@ def test_simple_http_resolver(self):
 
         ident = '0002'
         resolved_path, fmt = self.app.resolver.resolve(ident)
-        self.assertIsNotNone(resolved_path)
+        self.assertTrue(resolved_path)
         self.assertEqual(fmt, 'tif')
         self.assertTrue(isfile(resolved_path))
 
         ident = '0003'
         resolved_path, fmt = self.app.resolver.resolve(ident)
-        self.assertIsNotNone(resolved_path)
+        self.assertTrue(resolved_path)
         self.assertEqual(fmt, 'tif')
         self.assertTrue(isfile(resolved_path))
 

tests/simple_http_resolver_ut.py

@@ -102,7 +102,8 @@ def test_does_not_exist(self):
     def test_resolve_001(self):
         expected_resolved = (self.expected_filepath, self.expected_format)
         resolved = self.resolver.resolve(self.identifier)
-        self.assertSequenceEqual(resolved, expected_resolved)
+        self.assertEqual(resolved[0], expected_resolved[0])
+        self.assertEqual(resolved[1], expected_resolved[1])
         # Make sure the file exists in the cache
         self.assertTrue(os.path.isfile(self.expected_filepath))