changeset 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
files tests/run-tests.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Mon Apr 13 16:31:19 2015 -0400
+++ b/tests/run-tests.py	Mon Apr 13 16:33:12 2015 -0400
@@ -1823,13 +1823,16 @@
 
             failed = False
             warned = False
+            kws = self.options.keywords
+            if kws is not None and sys.version_info[0] == 3:
+                kws = kws.encode('utf-8')
 
             suite = TestSuite(self._testdir,
                               jobs=self.options.jobs,
                               whitelist=self.options.whitelisted,
                               blacklist=self.options.blacklist,
                               retest=self.options.retest,
-                              keywords=self.options.keywords,
+                              keywords=kws,
                               loop=self.options.loop,
                               runs_per_test=self.options.runs_per_test,
                               tests=tests, loadtest=self._gettest)