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

@@ -25,7 +25,6 @@
 fromgit.objects.utilimportget_object_type_by_name
 fromgitdb.utilimporthex_to_bin
 fromgit.compatimportis_win
-fromgit.utilimportHIDE_WINDOWS_KNOWN_ERRORS
 
 
 classTestBase(TestBase):
@@ -42,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
@@ -56,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)
 
@@ -79,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:
@@ -99,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):
@@ -111,7 +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_KNOWN_ERRORS, "FIXME: Freezes!")
+#@skipIf(HIDE_WINDOWS_FREEZE_ERRORS, "FIXME: Freezes! sometimes...")
 deftest_with_rw_remote_and_rw_repo(self):
 withrw_and_rw_remote_repos(self.rorepo, '0.1.6') as (rw_repo, rw_remote_repo):
 assertnotrw_repo.config_reader("repository").getboolean("core", "bare")