Mercurial > public > mercurial-scm > hg-stable
diff tests/run-tests.py @ 41768:aaad36b88298
cleanup: use () to wrap long lines instead of \
This is a little less brittle, and often helps indentation. In a
surprising number of cases the entire cleanup was deleting the \, as
the expression was *already* parenthesized in a workable way.
Differential Revision: https://phab.mercurial-scm.org/D5993
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 20 Feb 2019 19:28:51 -0500 |
| parents | 15d3facfa40a |
| children | 9f53a4e2e193 |
line wrap: on
line diff
--- a/tests/run-tests.py Sun Jan 13 20:13:22 2019 -0500 +++ b/tests/run-tests.py Wed Feb 20 19:28:51 2019 -0500 @@ -929,8 +929,8 @@ 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: + if ((ret != 0 or out != self._refout) and not self._skipped + and not self._debug): with open(self.errpath, 'wb') as f: for line in out: f.write(line) @@ -978,8 +978,8 @@ # 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: + if ((self._ret != 0 or self._out != self._refout) and not self._skipped + and not self._debug and self._out): with open(self.errpath, 'wb') as f: for line in self._out: f.write(line) @@ -1105,8 +1105,8 @@ if 'HGTESTCATAPULTSERVERPIPE' not in env: # If we don't have HGTESTCATAPULTSERVERPIPE explicitly set, pull the # non-test one in as a default, otherwise set to devnull - env['HGTESTCATAPULTSERVERPIPE'] = \ - env.get('HGCATAPULTSERVERPIPE', os.devnull) + env['HGTESTCATAPULTSERVERPIPE'] = env.get( + 'HGCATAPULTSERVERPIPE', os.devnull) extraextensions = [] for opt in self._extraconfigopts: