tesr, #519: FIX failures in py2.6 due to missing assertRaisesRegexp

ankostis · ankostis · commit 781040570fdb · 2016-09-26T11:08:57.000+02:00
diff --git a/git/test/test_index.py b/git/test/test_index.py
@@ -33,6 +33,7 @@
 import sys
 import tempfile
 import shutil
+from unittest import skipIf
 from stat import (
     S_ISLNK,
     ST_MODE
@@ -135,7 +136,7 @@ def _cmp_tree_index(self, tree, index):
             raise AssertionError("CMP Failed: Missing entries in index: %s, missing in tree: %s" %
                                  (bset - iset, iset - bset))
         # END assertion message
-        
+
     @with_rw_repo('0.1.6')
     def test_index_lock_handling(self, rw_repo):
         def add_bad_blob():
@@ -155,6 +156,7 @@ def add_bad_blob():
         except Exception as ex:
             assert "index.lock' could not be obtained" not in str(ex)
 
+    @skipIf(sys.version_info < (2, 7), reason="not `assertRaisesRegexp` in py2.6")
     @with_rw_repo('0.1.6')
     def test_index_file_from_tree(self, rw_repo):
         common_ancestor_sha = "5117c9c8a4d3af19a9958677e45cda9269de1541"
@@ -576,7 +578,7 @@ def mixed_iterator():
         if sys.platform != "win32":
             for target in ('/etc/nonexisting', '/etc/passwd', '/etc'):
                 basename = "my_real_symlink"
-                
+
                 link_file = os.path.join(rw_repo.working_tree_dir, basename)
                 os.symlink(target, link_file)
                 entries = index.reset(new_commit).add([link_file], fprogress=self._fprogress_add)
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
@@ -50,6 +50,7 @@
 from io import BytesIO
 
 from nose import SkipTest
+from unittest import skipIf
 
 
 def iter_flatten(lol):
@@ -106,7 +107,7 @@ def test_tree_from_revision(self):
 
         # try from invalid revision that does not exist
         self.failUnlessRaises(BadName, self.rorepo.tree, 'hello world')
-        
+
     def test_pickleable(self):
         pickle.loads(pickle.dumps(self.rorepo))
 
@@ -312,6 +313,7 @@ def test_archive(self):
         stream.close()
         os.remove(tmpfile)
 
+    @skipIf(sys.version_info < (2, 7), reason="not `assertRaisesRegexp` in py2.6")
     @patch.object(Git, '_call_process')
     def test_should_display_blame_information(self, git):
         git.return_value = fixture('blame')
