Mercurial: tests/run-tests.py comparison

comparison tests/run-tests.py @ 35450:e31773898197

run-tests: use context managers for file descriptors I've seen the following error a few times recently when running the tests with `yes | ./run-tests.py --local -j9 -i`: Errored test-add.t: Traceback (most recent call last): File "./run-tests.py", line 821, in run self.runTest() File "./run-tests.py", line 910, in runTest if self._result.addOutputMismatch(self, ret, out, self._refout): File "./run-tests.py", line 1774, in addOutputMismatch rename(test.errpath, test.path) File "./run-tests.py", line 571, in rename os.remove(src) WindowsError: [Error 32] The process cannot access the file because it is being used by another process: 'c:\\Users\\Matt\\projects\\hg\\tests\\test-add.t.err' This change doesn't fix the problem, but it seems like a simple enough improvement.

author	Matt Harbison <matt_harbison@yahoo.com>
date	Sun, 17 Dec 2017 14:06:49 -0500
parents	24528dba0e64
children	4f5596e5e311

comparison

equal deleted inserted replaced

-:24528dba0e64
+:e31773898197
 self.fail('no result code from test')
 elif out != self._refout:
 # Diff generation may rely on written .err file.
 if (ret != 0 or out != self._refout) and not self._skipped \
 and not self._debug:
-f = open(self.errpath, 'wb')
+with open(self.errpath, 'wb') as f:
 for line in out:
 f.write(line)
-f.close()
 # The result object handles diff calculation for us.
 if self._result.addOutputMismatch(self, ret, out, self._refout):
 # change was accepted, skip failing
 return
 # files are deleted
 shutil.rmtree(self._chgsockdir, True)
 if (self._ret != 0 or self._out != self._refout) and not self._skipped \
 and not self._debug and self._out:
-f = open(self.errpath, 'wb')
+with open(self.errpath, 'wb') as f:
 for line in self._out:
 f.write(line)
-f.close()
 vlog("# Ret was:", self._ret, '(%s)' % self.name)
 def _run(self, env):
 # This should be implemented in child classes to run tests.
 return env
 def _createhgrc(self, path):
 """Create an hgrc file for this test."""
-hgrc = open(path, 'wb')
+with open(path, 'wb') as hgrc:
 hgrc.write(b'[ui]\n')
 hgrc.write(b'slash = True\n')
 hgrc.write(b'interactive = False\n')
 hgrc.write(b'mergemarkers = detailed\n')
 hgrc.write(b'promptecho = True\n')
 hgrc.write(b'[defaults]\n')
 hgrc.write(b'[devel]\n')
 hgrc.write(b'all-warnings = true\n')
 hgrc.write(b'default-date = 0 0\n')
 hgrc.write(b'[largefiles]\n')
 hgrc.write(b'usercache = %s\n' %
 (os.path.join(self._testtmp, b'.cache/largefiles')))
 hgrc.write(b'[lfs]\n')
 hgrc.write(b'usercache = %s\n' %
 (os.path.join(self._testtmp, b'.cache/lfs')))
 hgrc.write(b'[web]\n')
 hgrc.write(b'address = localhost\n')
 hgrc.write(b'ipv6 = %s\n' % str(self._useipv6).encode('ascii'))
 for opt in self._extraconfigopts:
 section, key = opt.encode('utf-8').split(b'.', 1)
 assert b'=' in key, ('extra config opt %s must '
 'have an = for assignment' % opt)
 hgrc.write(b'[%s]\n%s\n' % (section, key))
-hgrc.close()
 def fail(self, msg):
 # unittest differentiates between errored and failed.
 # Failed is denoted by AssertionError (by default at least).
 raise AssertionError(msg)
 @property
 def refpath(self):
 return os.path.join(self._testdir, self.bname)
 def _run(self, env):
-f = open(self.path, 'rb')
+with open(self.path, 'rb') as f:
 lines = f.readlines()
-f.close()
 # .t file is both reference output and the test input, keep reference
 # output updated with the the test input. This avoids some race
 # conditions where the reference output does not match the actual test.
 if self._refout is not None:
 salt, script, after, expected = self._parsetest(lines)
 # Write out the generated script.
 fname = b'%s.sh' % self._testtmp
-f = open(fname, 'wb')
+with open(fname, 'wb') as f:
 for l in script:
 f.write(l)
-f.close()
 cmd = b'%s "%s"' % (self._shell, fname)
 vlog("# Running", cmd)
 exitcode, output = self._runcommand(cmd, env)
 if self._retest and not os.path.exists(test.errpath):
 result.addIgnore(test, 'not retesting')
 continue
 if self._keywords:
-f = open(test.path, 'rb')
+with open(test.path, 'rb') as f:
 t = f.read().lower() + test.bname.lower()
-f.close()
 ignored = False
 for k in self._keywords.lower().split():
 if k not in t:
 result.addIgnore(test, "doesn't match keyword")
 ignored = True
 os.remove(installerrs)
 except OSError as e:
 if e.errno != errno.ENOENT:
 raise
 else:
-f = open(installerrs, 'rb')
+with open(installerrs, 'rb') as f:
 for line in f:
 if PYTHON3:
 sys.stdout.buffer.write(line)
 else:
 sys.stdout.write(line)
-f.close()
 sys.exit(1)
 os.chdir(self._testdir)
 self._usecorrectpython()
 if self.options.py3k_warnings and not self.options.anycoverage:
 vlog("# Updating hg command to enable Py3k Warnings switch")
-f = open(os.path.join(self._bindir, 'hg'), 'rb')
+with open(os.path.join(self._bindir, 'hg'), 'rb') as f:
 lines = [line.rstrip() for line in f]
 lines[0] += ' -3'
-f.close()
+with open(os.path.join(self._bindir, 'hg'), 'wb') as f:
-f = open(os.path.join(self._bindir, 'hg'), 'wb')
+for line in lines:
-for line in lines:
+f.write(line + '\n')
-f.write(line + '\n')
-f.close()
 hgbat = os.path.join(self._bindir, b'hg.bat')
 if os.path.isfile(hgbat):
 # hg.bat expects to be put in bin/scripts while run-tests.py
 # installation layout put it in bin/ directly. Fix it
-f = open(hgbat, 'rb')
+with open(hgbat, 'rb') as f:
 data = f.read()
-f.close()
 if b'"%~dp0..\python" "%~dp0hg" %*' in data:
 data = data.replace(b'"%~dp0..\python" "%~dp0hg" %*',
 b'"%~dp0python" "%~dp0hg" %*')
-f = open(hgbat, 'wb')
+with open(hgbat, 'wb') as f:
 f.write(data)
-f.close()
 else:
 print('WARNING: cannot fix hg.bat reference to python.exe')
 if self.options.anycoverage:
 custom = os.path.join(self._testdir, 'sitecustomize.py')

Mercurial > hg

comparison tests/run-tests.py @ 35450:e31773898197