test, #525: allow disabling freeze errors separately

+ cmd: use DEVNULL for non PIPEs; no open-file. + TCs: some unitestize-assertions on base & remote TCs.

Author: ankostis

git/cmd.py

@@ -539,6 +539,9 @@ def execute(self, command,
 cmd_not_found_exception=OSError
 # end handle
 
+stdout_sink= (PIPE
+ifwith_stdout
+elsegetattr(subprocess, 'DEVNULL', open(os.devnull, 'wb')))
 log.debug("Popen(%s, cwd=%s, universal_newlines=%s, shell=%s)",
 command, cwd, universal_newlines, shell)
 try:
@@ -548,9 +551,9 @@ def execute(self, command,
 bufsize=-1,
 stdin=istream,
 stderr=PIPE,
-stdout=PIPEifwith_stdoutelseopen(os.devnull, 'wb'),
+stdout=stdout_sink,
 shell=shellisnotNoneandshellorself.USE_SHELL,
-close_fds=(is_posix), # unsupported on windows
+close_fds=is_posix, # unsupported on windows
 universal_newlines=universal_newlines,
 creationflags=PROC_CREATIONFLAGS,
 **subprocess_kwargs

git/test/test_base.py

@@ -41,7 +41,7 @@ def tearDown(self):
 deftest_base_object(self):
 # test interface of base object classes
 types= (Blob, Tree, Commit, TagObject)
-assertlen(types)==len(self.type_tuples)
+self.assertEqual(len(types), len(self.type_tuples))
 
 s=set()
 num_objs=0
@@ -55,12 +55,12 @@ def test_base_object(self):
 item=obj_type(self.rorepo, binsha, 0, path)
 # END handle index objects
 num_objs+=1
-assertitem.hexsha==hexsha
-assertitem.type==typename
+self.assertEqual(item.hexsha, hexsha)
+self.assertEqual(item.type, typename)
 assertitem.size
-assertitem==item
-assertnotitem!=item
-assertstr(item)==item.hexsha
+self.assertEqual(item, item)
+self.assertNotEqual(notitem, item)
+self.assertEqual(str(item), item.hexsha)
 assertrepr(item)
 s.add(item)
 
@@ -78,16 +78,16 @@ def test_base_object(self):
 
 tmpfilename=tempfile.mktemp(suffix='test-stream')
 withopen(tmpfilename, 'wb+') astmpfile:
-assertitem==item.stream_data(tmpfile)
+self.assertEqual(item, item.stream_data(tmpfile))
 tmpfile.seek(0)
-asserttmpfile.read()==data
+self.assertEqual(tmpfile.read(), data)
 os.remove(tmpfilename)
 # END for each object type to create
 
 # each has a unique sha
-assertlen(s)==num_objs
-assertlen(s|s)==num_objs
-assertnum_index_objs==2
+self.assertEqual(len(s), num_objs)
+self.assertEqual(len(s|s), num_objs)
+self.assertEqual(num_index_objs, 2)
 
 deftest_get_object_type_by_name(self):
 fortnameinbase.Object.TYPES:
@@ -98,7 +98,7 @@ def test_get_object_type_by_name(self):
 
 deftest_object_resolution(self):
 # objects must be resolved to shas so they compare equal
-assertself.rorepo.head.reference.object==self.rorepo.active_branch.object
+self.assertEqual(self.rorepo.head.reference.object, self.rorepo.active_branch.object)
 
 @with_rw_repo('HEAD', bare=True)
 deftest_with_bare_rw_repo(self, bare_rw_repo):
@@ -110,6 +110,7 @@ def test_with_rw_repo(self, rw_repo):
 assertnotrw_repo.config_reader("repository").getboolean("core", "bare")
 assertos.path.isdir(os.path.join(rw_repo.working_tree_dir, 'lib'))
 
+#@skipIf(HIDE_WINDOWS_FREEZE_ERRORS, "FIXME: Freezes! sometimes...")
 @with_rw_and_rw_remote_repo('0.1.6')
 deftest_with_rw_remote_and_rw_repo(self, rw_repo, rw_remote_repo):
 assertnotrw_repo.config_reader("repository").getboolean("core", "bare")

git/test/test_remote.py

@@ -4,14 +4,10 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-fromgit.test.libimport (
-TestBase,
-with_rw_repo,
-with_rw_and_rw_remote_repo,
-fixture,
-GIT_DAEMON_PORT,
-assert_raises
-)
+importrandom
+importtempfile
+fromunittest.caseimportskipIf
+
 fromgitimport (
 RemoteProgress,
 FetchInfo,
@@ -25,14 +21,19 @@
 Remote,
 GitCommandError
 )
-fromgit.utilimportIterableList, rmtree
+fromgit.cmdimportGit
 fromgit.compatimportstring_types
-importtempfile
+fromgit.test.libimport (
+TestBase,
+with_rw_repo,
+with_rw_and_rw_remote_repo,
+fixture,
+GIT_DAEMON_PORT,
+assert_raises
+)
+fromgit.utilimportIterableList, rmtree, HIDE_WINDOWS_FREEZE_ERRORS, HIDE_WINDOWS_KNOWN_ERRORS
 importos.pathasosp
-importrandom
-fromunittest.caseimportskipIf
-fromgit.utilimportHIDE_WINDOWS_KNOWN_ERRORS
-fromgit.cmdimportGit
+
 
 # assure we have repeatable results
 random.seed(0)
@@ -213,7 +214,7 @@ def get_info(res, remote, name):
 new_remote_branch.rename("other_branch_name")
 res=fetch_and_test(remote)
 other_branch_info=get_info(res, remote, new_remote_branch)
-assertother_branch_info.ref.commit==new_branch_info.ref.commit
+self.assertEqual(other_branch_info.ref.commit, new_branch_info.ref.commit)
 
 # remove new branch
 Head.delete(new_remote_branch.repo, new_remote_branch)
@@ -223,34 +224,37 @@ def get_info(res, remote, name):
 
 # prune stale tracking branches
 stale_refs=remote.stale_refs
-assertlen(stale_refs) ==2andisinstance(stale_refs[0], RemoteReference)
+self.assertEqual(len(stale_refs), 2)
+self.assertIsInstance(stale_refs[0], RemoteReference)
 RemoteReference.delete(rw_repo, *stale_refs)
 
 # test single branch fetch with refspec including target remote
 res=fetch_and_test(remote, refspec="master:refs/remotes/%s/master"%remote)
-assertlen(res) ==1andget_info(res, remote, 'master')
+self.assertEqual(len(res), 1)
+self.assertTrue(get_info(res, remote, 'master'))
 
 # ... with respec and no target
 res=fetch_and_test(remote, refspec='master')
-assertlen(res)==1
+self.assertEqual(len(res), 1)
 
 # ... multiple refspecs ... works, but git command returns with error if one ref is wrong without
 # doing anything. This is new in later binaries
 # res = fetch_and_test(remote, refspec=['master', 'fred'])
-# assert len(res) == 1
+# self.assertEqual(len(res), 1)
 
 # add new tag reference
 rtag=TagReference.create(remote_repo, "1.0-RV_hello.there")
 res=fetch_and_test(remote, tags=True)
 tinfo=res[str(rtag)]
-assertisinstance(tinfo.ref, TagReference) andtinfo.ref.commit==rtag.commit
+self.assertIsInstance(tinfo.ref, TagReference)
+self.assertEqual(tinfo.ref.commit, rtag.commit)
 asserttinfo.flags&tinfo.NEW_TAG
 
 # adjust tag commit
 Reference.set_object(rtag, rhead.commit.parents[0].parents[0])
 res=fetch_and_test(remote, tags=True)
 tinfo=res[str(rtag)]
-asserttinfo.commit==rtag.commit
+self.assertEqual(tinfo.commit, rtag.commit)
 asserttinfo.flags&tinfo.TAG_UPDATE
 
 # delete remote tag - local one will stay
@@ -326,7 +330,7 @@ def _assert_push_and_pull(self, remote, rw_repo, remote_repo):
 
 # force rejected pull
 res=remote.push('+%s'%lhead.reference)
-assertres[0].flags&PushInfo.ERROR==0
+self.assertEqual(res[0].flags&PushInfo.ERROR, 0)
 assertres[0].flags&PushInfo.FORCED_UPDATE
 self._do_test_push_result(res, remote)
 
@@ -352,7 +356,8 @@ def _assert_push_and_pull(self, remote, rw_repo, remote_repo):
 
 # push force this tag
 res=remote.push("+%s"%new_tag.path)
-assertres[-1].flags&PushInfo.ERROR==0andres[-1].flags&PushInfo.FORCED_UPDATE
+self.assertEqual(res[-1].flags&PushInfo.ERROR, 0)
+self.assertTrue(res[-1].flags&PushInfo.FORCED_UPDATE)
 
 # delete tag - have to do it using refspec
 res=remote.push(":%s"%new_tag.path)
@@ -485,7 +490,7 @@ def test_creation_and_removal(self, bare_rw_repo):
 new_name="test_new_one"
 arg_list= (new_name, "git@server:hello.git")
 remote=Remote.create(bare_rw_repo, *arg_list)
-assertremote.name=="test_new_one"
+self.assertEqual(remote.name, "test_new_one")
 assertremoteinbare_rw_repo.remotes
 assertremote.exists()
 
@@ -520,7 +525,7 @@ def test_fetch_info(self):
 remote_info_line_fmt%"local/master",
 fetch_info_line_fmt%'remote-tracking branch')
 assertnotfi.ref.is_valid()
-assertfi.ref.name=="local/master"
+self.assertEqual(fi.ref.name, "local/master")
 
 # handles non-default refspecs: One can specify a different path in refs/remotes
 # or a special path just in refs/something for instance
@@ -547,23 +552,23 @@ def test_fetch_info(self):
 fetch_info_line_fmt%'tag')
 
 assertisinstance(fi.ref, TagReference)
-assertfi.ref.path==tag_path
+self.assertEqual(fi.ref.path, tag_path)
 
 # branches default to refs/remotes
 fi=FetchInfo._from_line(self.rorepo,
 remote_info_line_fmt%"remotename/branch",
 fetch_info_line_fmt%'branch')
 
 assertisinstance(fi.ref, RemoteReference)
-assertfi.ref.remote_name=='remotename'
+self.assertEqual(fi.ref.remote_name, 'remotename')
 
 # but you can force it anywhere, in which case we only have a references
 fi=FetchInfo._from_line(self.rorepo,
 remote_info_line_fmt%"refs/something/branch",
 fetch_info_line_fmt%'branch')
 
 asserttype(fi.ref) isReference
-assertfi.ref.path=="refs/something/branch"
+self.assertEqual(fi.ref.path, "refs/something/branch")
 
 deftest_uncommon_branch_names(self):
 stderr_lines=fixture('uncommon_branch_prefix_stderr').decode('ascii').splitlines()
@@ -574,8 +579,8 @@ def test_uncommon_branch_names(self):
 res= [FetchInfo._from_line('ShouldntMatterRepo', stderr, fetch_line)
 forstderr, fetch_lineinzip(stderr_lines, fetch_lines)]
 assertlen(res)
-assertres[0].remote_ref_path=='refs/pull/1/head'
-assertres[0].ref.path=='refs/heads/pull/1/head'
+self.assertEqual(res[0].remote_ref_path, 'refs/pull/1/head')
+self.assertEqual(res[0].ref.path, 'refs/heads/pull/1/head')
 assertisinstance(res[0].ref, Head)
 
 @with_rw_repo('HEAD', bare=False)
@@ -588,36 +593,36 @@ def test_multiple_urls(self, rw_repo):
 remote=rw_repo.remotes[0]
 # Testing setting a single URL
 remote.set_url(test1)
-assertlist(remote.urls)==[test1]
+self.assertEqual(list(remote.urls), [test1])
 
 # Testing replacing that single URL
 remote.set_url(test1)
-assertlist(remote.urls)==[test1]
+self.assertEqual(list(remote.urls), [test1])
 # Testing adding new URLs
 remote.set_url(test2, add=True)
-assertlist(remote.urls)==[test1, test2]
+self.assertEqual(list(remote.urls), [test1, test2])
 remote.set_url(test3, add=True)
-assertlist(remote.urls)==[test1, test2, test3]
+self.assertEqual(list(remote.urls), [test1, test2, test3])
 # Testing removing an URL
 remote.set_url(test2, delete=True)
-assertlist(remote.urls)==[test1, test3]
+self.assertEqual(list(remote.urls), [test1, test3])
 # Testing changing an URL
 remote.set_url(test3, test2)
-assertlist(remote.urls)==[test1, test2]
+self.assertEqual(list(remote.urls), [test1, test2])
 
 # will raise: fatal: --add --delete doesn't make sense
 assert_raises(GitCommandError, remote.set_url, test2, add=True, delete=True)
 
 # Testing on another remote, with the add/delete URL
 remote=rw_repo.create_remote('another', url=test1)
 remote.add_url(test2)
-assertlist(remote.urls)==[test1, test2]
+self.assertEqual(list(remote.urls), [test1, test2])
 remote.add_url(test3)
-assertlist(remote.urls)==[test1, test2, test3]
+self.assertEqual(list(remote.urls), [test1, test2, test3])
 # Testing removing all the URLs
 remote.delete_url(test2)
-assertlist(remote.urls)==[test1, test3]
+self.assertEqual(list(remote.urls), [test1, test3])
 remote.delete_url(test1)
-assertlist(remote.urls)==[test3]
+self.assertEqual(list(remote.urls), [test3])
 # will raise fatal: Will not delete all non-push URLs
 assert_raises(GitCommandError, remote.delete_url, test3)

git/util.py

@@ -51,6 +51,7 @@
 #: so the errors marked with this var are considered "acknowledged" ones, awaiting remedy,
 #: till then, we wish to hide them.
 HIDE_WINDOWS_KNOWN_ERRORS=is_winandos.environ.get('HIDE_WINDOWS_KNOWN_ERRORS', True)
+HIDE_WINDOWS_FREEZE_ERRORS=is_winandos.environ.get('HIDE_WINDOWS_FREEZE_ERRORS', HIDE_WINDOWS_KNOWN_ERRORS)
 
 #{Utility Methods