Commit efb69888 authored by Robert Bradshaw's avatar Robert Bradshaw

Lower verbosity of tests excluded due to bugs.

parent 0d39bf77
...@@ -1517,7 +1517,8 @@ class VersionDependencyExcluder: ...@@ -1517,7 +1517,8 @@ class VersionDependencyExcluder:
class FileListExcluder: class FileListExcluder:
def __init__(self, list_file): def __init__(self, list_file, verbose=False):
self.verbose = verbose
self.excludes = {} self.excludes = {}
self._list_file = list_file self._list_file = list_file
f = open(list_file) f = open(list_file)
...@@ -1532,7 +1533,7 @@ class FileListExcluder: ...@@ -1532,7 +1533,7 @@ class FileListExcluder:
def __call__(self, testname, tags=None): def __call__(self, testname, tags=None):
exclude = (testname in self.excludes exclude = (testname in self.excludes
or testname.split('.')[-1] in self.excludes) or testname.split('.')[-1] in self.excludes)
if exclude: if exclude and self.verbose:
print("Excluding %s because it's listed in %s" print("Excluding %s because it's listed in %s"
% (testname, self._list_file)) % (testname, self._list_file))
return exclude return exclude
...@@ -1938,6 +1939,7 @@ def runtests(options, cmd_args, coverage=None): ...@@ -1938,6 +1939,7 @@ def runtests(options, cmd_args, coverage=None):
test_bugs = True test_bugs = True
selectors = [ string_selector(r) for r in cmd_args ] selectors = [ string_selector(r) for r in cmd_args ]
verbose_excludes = selectors or options.verbosity >= 2
if not selectors: if not selectors:
selectors = [ lambda x, tags=None: True ] selectors = [ lambda x, tags=None: True ]
...@@ -1969,7 +1971,7 @@ def runtests(options, cmd_args, coverage=None): ...@@ -1969,7 +1971,7 @@ def runtests(options, cmd_args, coverage=None):
exclude_selectors.append(ShardExcludeSelector(options.shard_num, options.shard_count)) exclude_selectors.append(ShardExcludeSelector(options.shard_num, options.shard_count))
if not test_bugs: if not test_bugs:
exclude_selectors += [ FileListExcluder(os.path.join(ROOTDIR, "bugs.txt")) ] exclude_selectors += [ FileListExcluder(os.path.join(ROOTDIR, "bugs.txt"), verbose=verbose_excludes) ]
if sys.platform in ['win32', 'cygwin'] and sys.version_info < (2,6): if sys.platform in ['win32', 'cygwin'] and sys.version_info < (2,6):
exclude_selectors += [ lambda x: x == "run.specialfloat" ] exclude_selectors += [ lambda x: x == "run.specialfloat" ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment