Mercurial > hg
comparison tests/run-tests.py @ 25050:28526bb5b3b5
run-tests: make sure keyword(s) are in bytes and not str
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 13 Apr 2015 16:33:12 -0400 |
| parents | 55f1ac2797cc |
| children | 9c28f3236677 |
comparison
equal
deleted
inserted
replaced
| 25049:55f1ac2797cc | 25050:28526bb5b3b5 |
|---|---|
| 1821 | 1821 |
| 1822 tests = [self._gettest(t, i) for i, t in enumerate(tests)] | 1822 tests = [self._gettest(t, i) for i, t in enumerate(tests)] |
| 1823 | 1823 |
| 1824 failed = False | 1824 failed = False |
| 1825 warned = False | 1825 warned = False |
| 1826 kws = self.options.keywords | |
| 1827 if kws is not None and sys.version_info[0] == 3: | |
| 1828 kws = kws.encode('utf-8') | |
| 1826 | 1829 |
| 1827 suite = TestSuite(self._testdir, | 1830 suite = TestSuite(self._testdir, |
| 1828 jobs=self.options.jobs, | 1831 jobs=self.options.jobs, |
| 1829 whitelist=self.options.whitelisted, | 1832 whitelist=self.options.whitelisted, |
| 1830 blacklist=self.options.blacklist, | 1833 blacklist=self.options.blacklist, |
| 1831 retest=self.options.retest, | 1834 retest=self.options.retest, |
| 1832 keywords=self.options.keywords, | 1835 keywords=kws, |
| 1833 loop=self.options.loop, | 1836 loop=self.options.loop, |
| 1834 runs_per_test=self.options.runs_per_test, | 1837 runs_per_test=self.options.runs_per_test, |
| 1835 tests=tests, loadtest=self._gettest) | 1838 tests=tests, loadtest=self._gettest) |
| 1836 verbosity = 1 | 1839 verbosity = 1 |
| 1837 if self.options.verbose: | 1840 if self.options.verbose: |